Merge branch 'add-network-id' into 'master'

Add "networkId" field into network interface See merge request !15
bwsw · Oct 5, 2018 · 4942960 · 4942960
2 parents 0c98837 + 51a29c6
commit 4942960
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/src/main/scala/com/bwsw/cloudstack/entities/events/jobresults/NetworkInterface.scala b/src/main/scala/com/bwsw/cloudstack/entities/events/jobresults/NetworkInterface.scala
@@ -25,6 +25,7 @@ import spray.json.DefaultJsonProtocol._
 import spray.json.RootJsonFormat
 
 final case class NetworkInterface(id: UUID,
+                                  networkId: UUID,
                                   secondaryIps: Seq[SecondaryIp])
 
 
@@ -34,6 +35,7 @@ object NetworkInterface {
     jsonFormat(
       NetworkInterface.apply,
       "id",
+      "networkid",
       "secondaryip"
     )
 }
diff --git a/src/main/scala/com/bwsw/cloudstack/entities/responses/vm/NetworkInterface.scala b/src/main/scala/com/bwsw/cloudstack/entities/responses/vm/NetworkInterface.scala
@@ -24,5 +24,6 @@ import com.bwsw.cloudstack.entities.responses.common.Entity
 import com.fasterxml.jackson.annotation.JsonProperty
 
 final case class NetworkInterface(id: UUID,
+                                  @JsonProperty("networkid") networkId: UUID,
                                   @JsonProperty("secondaryip") secondaryIps: Seq[SecondaryIp])
   extends Entity
diff --git a/src/test/scala/com/bwsw/cloudstack/entities/common/DefaultJsonFormatsTests.scala b/src/test/scala/com/bwsw/cloudstack/entities/common/DefaultJsonFormatsTests.scala
@@ -150,10 +150,12 @@ class DefaultJsonFormatsTests
               networkInterfaces = Seq(
                 NetworkInterface(
                   id = UUID.fromString("674aeb81-c153-4b39-b462-85d47c304efc"),
+                  networkId = UUID.fromString("95b8b9cf-fd93-4601-b037-915b2bf5d5a2"),
                   secondaryIps = Seq.empty
                 ),
                 NetworkInterface(
                   id = UUID.fromString("ace7cb25-6b7a-4315-b519-59d1fde5666f"),
+                  networkId = UUID.fromString("a72d1fb8-c754-42f2-8bad-295084c4f981"),
                   secondaryIps = Seq.empty
                 )
               ),

diff --git a/src/test/scala/com/bwsw/cloudstack/entities/common/JsonFormatsTests.scala b/src/test/scala/com/bwsw/cloudstack/entities/common/JsonFormatsTests.scala
@@ -111,10 +111,12 @@ class JsonFormatsTests
                 networkInterfaces = Seq(
                   NetworkInterface(
                     id = UUID.fromString("674aeb81-c153-4b39-b462-85d47c304efc"),
+                    networkId = UUID.fromString("95b8b9cf-fd93-4601-b037-915b2bf5d5a2"),
                     secondaryIps = Seq.empty
                   ),
                   NetworkInterface(
                     id = UUID.fromString("ace7cb25-6b7a-4315-b519-59d1fde5666f"),
+                    networkId = UUID.fromString("a72d1fb8-c754-42f2-8bad-295084c4f981"),
                     secondaryIps = Seq.empty
                   )
                 ),