Merge pull request #3831 from mesosphere/gk/fixes-#3820

Fixes #3820 - Fix deployment steps serialization
mesosphere · Apr 25, 2016 · d249edb · d249edb
2 parents 05efd28 + 595eba7
commit d249edb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala b/src/main/scala/mesosphere/marathon/api/v2/json/Formats.scala
@@ -354,7 +354,7 @@ trait DeploymentFormats {
 
   implicit lazy val DeploymentActionWrites: Writes[DeploymentAction] = Writes { action =>
     Json.obj(
-      "type" -> action.getClass.getSimpleName,
+      "action" -> action.getClass.getSimpleName,
       "app" -> action.app.id
     )
   }

diff --git a/src/test/scala/mesosphere/marathon/api/v2/GroupsResourceTest.scala b/src/test/scala/mesosphere/marathon/api/v2/GroupsResourceTest.scala
@@ -35,11 +35,11 @@ class GroupsResourceTest extends MarathonSpec with Matchers with Mockito with Gi
     assert(steps.size == 2)
 
     val firstStep = (steps.head \ "actions").as[Seq[JsObject]].head
-    assert((firstStep \ "type").as[String] == "StartApplication")
+    assert((firstStep \ "action").as[String] == "StartApplication")
     assert((firstStep \ "app").as[String] == "/test/app")
 
     val secondStep = (steps.last \ "actions").as[Seq[JsObject]].head
-    assert((secondStep \ "type").as[String] == "ScaleApplication")
+    assert((secondStep \ "action").as[String] == "ScaleApplication")
     assert((secondStep \ "app").as[String] == "/test/app")
   }
 

diff --git a/src/test/scala/mesosphere/marathon/api/v2/json/DeploymentFormatsTest.scala b/src/test/scala/mesosphere/marathon/api/v2/json/DeploymentFormatsTest.scala
@@ -100,9 +100,13 @@ class DeploymentFormatsTest extends MarathonSpec {
       Seq(genStep),
       Timestamp.now()
     )
-    val json = Json.toJson(plan)
-    val fieldMap = json.as[JsObject].fields.toMap
+    val json = Json.toJson(plan).as[JsObject]
+    val fieldMap = json.fields.toMap
     fieldMap.keySet should be(Set("version", "id", "target", "original", "steps"))
+
+    val action = ((json \ "steps")(0) \ "actions")(0)
+    val actionFields = action.as[JsObject].fields.toMap.keySet
+    actionFields should be(Set("action", "app"))
   }
 
   // regression test for #1176