Merge branch 'add-memory-to-vm' into 'master'

Add "memory" field into virtual machine entities See merge request !13
bwsw · Oct 2, 2018 · ab4927d · ab4927d
2 parents b5e6c32 + 84fdb96
commit ab4927d
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 37 deletions.
diff --git a/src/it/scala/com/bwsw/cloudstack/entities/TestEntities.scala b/src/it/scala/com/bwsw/cloudstack/entities/TestEntities.scala
@@ -27,6 +27,7 @@ import com.bwsw.cloudstack.entities.requests.serviceoffering.ServiceOfferingFind
 import com.bwsw.cloudstack.entities.requests.template.TemplateFindRequest
 import com.bwsw.cloudstack.entities.requests.template.filters.Featured
 import com.bwsw.cloudstack.entities.requests.zone.ZoneFindRequest
+import com.bwsw.cloudstack.entities.responses.serviceoffering.ServiceOffering
 import com.bwsw.cloudstack.entities.util.dao.{DomainDao, ServiceOfferingDao, TemplateDao, ZoneDao}
 
 trait TestEntities {
@@ -45,10 +46,10 @@ trait TestEntities {
   val executor = new Executor(executorSettings, creator, true)
   val mapper = new JsonMapper(true)
 
-  val retrievedServiceOfferingId: UUID = {
+  val retrievedServiceOffering: ServiceOffering = {
     val serviceOfferingDao = new ServiceOfferingDao(executor, mapper)
     val serviceOfferingFindRequest = new ServiceOfferingFindRequest
-    serviceOfferingDao.find(serviceOfferingFindRequest).head.id
+    serviceOfferingDao.find(serviceOfferingFindRequest).head
   }
 
   val retrievedTemplateId: UUID = {

diff --git a/src/it/scala/com/bwsw/cloudstack/entities/dao/TagDaoIntegrationTestSuite.scala b/src/it/scala/com/bwsw/cloudstack/entities/dao/TagDaoIntegrationTestSuite.scala
@@ -100,7 +100,7 @@ class TagDaoIntegrationTestSuite extends FlatSpec with TestEntities {
 
     createAccount(accountId, firstAccountName, Some(domainId))
 
-    val serviceOfferingId = retrievedServiceOfferingId
+    val serviceOfferingId = retrievedServiceOffering.id
     val templateId = retrievedTemplateId
     val zoneId = retrievedZoneId
 

diff --git a/src/it/scala/com/bwsw/cloudstack/entities/dao/VmDaoIntegrationTestSuite.scala b/src/it/scala/com/bwsw/cloudstack/entities/dao/VmDaoIntegrationTestSuite.scala
@@ -43,7 +43,7 @@ class VmDaoIntegrationTestSuite extends FlatSpec with TestEntities {
 
     assert(vmDao.find(findByAccountNameRequest).isEmpty)
 
-    val serviceOfferingId = retrievedServiceOfferingId
+    val serviceOfferingId = retrievedServiceOffering.id
     val templateId = retrievedTemplateId
     val zoneId = retrievedZoneId
 

diff --git a/src/it/scala/com/bwsw/cloudstack/entities/events/VmEventsRetrievingTest.scala b/src/it/scala/com/bwsw/cloudstack/entities/events/VmEventsRetrievingTest.scala
@@ -36,7 +36,7 @@ class VmEventsRetrievingTest
     with BeforeAndAfterAll
     with Matchers {
 
-  val serviceOfferingId: UUID = retrievedServiceOfferingId
+  val serviceOfferingId: UUID = retrievedServiceOffering.id
   val templateId: UUID = retrievedTemplateId
   val zoneId: UUID = retrievedZoneId
 

diff --git a/.../scala/com/bwsw/cloudstack/entities/requests/vm/VmCreateRequestIntegrationTestSuite.scala b/.../scala/com/bwsw/cloudstack/entities/requests/vm/VmCreateRequestIntegrationTestSuite.scala
@@ -35,7 +35,8 @@ class VmCreateRequestIntegrationTestSuite
     with TestEntities
     with Matchers {
 
-  val serviceOfferingId: UUID = retrievedServiceOfferingId
+  val serviceOfferingId: UUID = retrievedServiceOffering.id
+  val memory: Long = retrievedServiceOffering.memory
   val templateId: UUID = retrievedTemplateId
   val zoneId: UUID = retrievedZoneId
 
@@ -66,7 +67,16 @@ class VmCreateRequestIntegrationTestSuite
 
     val actualVm = mapper.deserialize[VirtualMachineFindResponse](executor.executeRequest(vmFindRequest.getRequest))
       .entityList.entities.get.head
-    val expectedVm = VirtualMachine(vmId, zoneId, templateId, serviceOfferingId, accountName, domainId, Seq.empty)
+    val expectedVm = VirtualMachine(
+      vmId,
+      zoneId,
+      templateId,
+      serviceOfferingId,
+      accountName,
+      domainId,
+      Seq.empty,
+      memory
+    )
 
     actualVm.copy(networkInterfaces = Seq.empty) shouldBe expectedVm
     actualVm.networkInterfaces.size should be > 0

diff --git a/src/main/scala/com/bwsw/cloudstack/entities/events/jobresults/VirtualMachineJobResult.scala b/src/main/scala/com/bwsw/cloudstack/entities/events/jobresults/VirtualMachineJobResult.scala
@@ -28,7 +28,8 @@ final case class VirtualMachineJobResult(id: UUID,
                                          account: String,
                                          domainId: UUID,
                                          serviceOfferingId: UUID,
-                                         networkInterfaces: Seq[NetworkInterface])
+                                         networkInterfaces: Seq[NetworkInterface],
+                                         memory: Long)
 
 
 object VirtualMachineJobResult {
@@ -40,6 +41,7 @@ object VirtualMachineJobResult {
       "account",
       "domainid",
       "serviceofferingid",
-      "nic"
+      "nic",
+      "memory"
     )
 }
diff --git a/src/main/scala/com/bwsw/cloudstack/entities/responses/serviceoffering/ServiceOffering.scala b/src/main/scala/com/bwsw/cloudstack/entities/responses/serviceoffering/ServiceOffering.scala
@@ -23,5 +23,6 @@ import java.util.UUID
 import com.bwsw.cloudstack.entities.responses.common.Entity
 
 case class ServiceOffering(id: UUID,
-                           name: String)
+                           name: String,
+                           memory: Long)
   extends Entity
diff --git a/src/main/scala/com/bwsw/cloudstack/entities/responses/vm/VirtualMachine.scala b/src/main/scala/com/bwsw/cloudstack/entities/responses/vm/VirtualMachine.scala
@@ -29,5 +29,6 @@ case class VirtualMachine(id: UUID,
                           @JsonProperty("serviceofferingid") serviceOfferingId: UUID,
                           @JsonProperty("account") accountName: String,
                           @JsonProperty("domainid") domainId: UUID,
-                          @JsonProperty("nic") networkInterfaces: Seq[NetworkInterface])
+                          @JsonProperty("nic") networkInterfaces: Seq[NetworkInterface],
+                          memory: Long)
   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
@@ -156,7 +156,8 @@ class DefaultJsonFormatsTests
                   id = UUID.fromString("ace7cb25-6b7a-4315-b519-59d1fde5666f"),
                   secondaryIps = Seq.empty
                 )
-              )
+              ),
+              memory = 512 //scalastyle:ignore
             )
           )
         )

diff --git a/src/test/scala/com/bwsw/cloudstack/entities/common/JsonFormatsTests.scala b/src/test/scala/com/bwsw/cloudstack/entities/common/JsonFormatsTests.scala
@@ -18,11 +18,10 @@
 */
 package com.bwsw.cloudstack.entities.common
 
-import java.time.{OffsetDateTime, ZoneOffset}
 import java.util.UUID
 
 import com.bwsw.cloudstack.entities.events.Constants.Statuses
-import com.bwsw.cloudstack.entities.events.jobresults.VirtualMachineJobResult
+import com.bwsw.cloudstack.entities.events.jobresults.{NetworkInterface, VirtualMachineJobResult}
 import com.bwsw.cloudstack.entities.events.vm.VirtualMachineCreateEvent
 import com.bwsw.cloudstack.entities.events.{CloudStackEvent, JobResult, UnknownEvent}
 import org.scalatest.prop.TableDrivenPropertyChecks
@@ -85,32 +84,41 @@ class JsonFormatsTests
       ("json", "event"),
       (
         """{
-          |  "eventDateTime": "2017-11-12 13:36:23 +0700",
-          |  "VirtualMachineTemplate": "aaa5faf7-7680-4393-aee5-c9997b3420cd",
-          |  "ServiceOffering": "b1196c0e-0c1a-4416-bea8-f6a62309fac5",
-          |  "description": "starting Vm. Vm Id: 12",
-          |  "SecurityGroup": "86036515-1f1c-4a48-92ac-519ef0e22912",
-          |  "DataCenter": "d477bb3f-3592-4503-8f2a-da3d878dd476",
-          |  "entityuuid": "63f55cf9-2d1b-42f0-9202-a784af1d39ed",
-          |  "event": "VM.CREATE",
-          |  "user": "c1ebed36-c69b-11e7-bdcf-0242ac110004",
-          |  "account": "c1ebdda3-c69b-11e7-bdcf-0242ac110004",
-          |  "entity": "com.cloud.vm.VirtualMachine",
-          |  "status": "Scheduled",
-          |  "VirtualMachine": "63f55cf9-2d1b-42f0-9202-a784af1d39ed",
-          |  "jobResult": "org.apache.cloudstack.api.response.UserVmResponse/virtualmachine/{\"id\":\"63f55cf9-2d1b-42f0-9202-a784af1d39ed\",\"account\":\"Account Name\",\"domainid\":\"16d7977e-43fd-47ad-9fff-6ef8d463516f\",\"serviceofferingid\":\"b1196c0e-0c1a-4416-bea8-f6a62309fac5\",\"nic\":[]}"
-          |}""".stripMargin,
+          |  "jobId": "2c9bd9c7-11e1-4354-abb5-2c619fbb4589",
+          |  "commandEventType": "VM.CREATE",
+          |  "processStatus": "0",
+          |  "cmdInfo": "{\"iptonetworklist[0].networkid\":\"95b8b9cf-fd93-4601-b037-915b2bf5d5a2\",\"httpmethod\":\"GET\",\"templateid\":\"9b5a23d5-f503-11e7-a402-0242ac110003\",\"ctxAccountId\":\"37\",\"uuid\":\"991558d9-5dfe-4272-85aa-98cbf7c10830\",\"cmdEventType\":\"VM.CREATE\",\"serviceofferingid\":\"891b5344-83c6-453a-8521-1cdfa17f920b\",\"response\":\"json\",\"ctxUserId\":\"37\",\"hypervisor\":\"Simulator\",\"iptonetworklist[1].networkid\":\"a72d1fb8-c754-42f2-8bad-295084c4f981\",\"zoneid\":\"9f5c2d2a-05ac-476d-b274-f58cc211b007\",\"ctxStartEventId\":\"1873\",\"id\":\"36\",\"ctxDetails\":\"{\\\"interface com.cloud.vm.VirtualMachine\\\":\\\"991558d9-5dfe-4272-85aa-98cbf7c10830\\\",\\\"interface com.cloud.template.VirtualMachineTemplate\\\":\\\"9b5a23d5-f503-11e7-a402-0242ac110003\\\",\\\"interface com.cloud.dc.DataCenter\\\":\\\"9f5c2d2a-05ac-476d-b274-f58cc211b007\\\",\\\"interface com.cloud.offering.ServiceOffering\\\":\\\"891b5344-83c6-453a-8521-1cdfa17f920b\\\"}\",\"_\":\"1537859651513\"}",
+          |  "instanceType": "VirtualMachine",
+          |  "jobResult": "org.apache.cloudstack.api.response.UserVmResponse/virtualmachine/{\"id\":\"991558d9-5dfe-4272-85aa-98cbf7c10830\",\"name\":\"VM-991558d9-5dfe-4272-85aa-98cbf7c10830\",\"displayname\":\"VM-991558d9-5dfe-4272-85aa-98cbf7c10830\",\"account\":\"aaa\",\"userid\":\"9e476079-af42-4a55-9880-e9811595a104\",\"username\":\"aaa\",\"domainid\":\"bcaf64de-56ff-44ef-9f4a-d5959cb3d63b\",\"domain\":\"aaa\",\"created\":\"2018-09-25T07:14:11+0000\",\"state\":\"Running\",\"haenable\":false,\"zoneid\":\"9f5c2d2a-05ac-476d-b274-f58cc211b007\",\"zonename\":\"Sandbox-simulator-advanced\",\"templateid\":\"9b5a23d5-f503-11e7-a402-0242ac110003\",\"templatename\":\"CentOS 5.6 (64-bit) no GUI (Simulator)\",\"templatedisplaytext\":\"CentOS 5.6 (64-bit) no GUI (Simulator)\",\"passwordenabled\":false,\"serviceofferingid\":\"891b5344-83c6-453a-8521-1cdfa17f920b\",\"serviceofferingname\":\"Small Instance\",\"cpunumber\":1,\"cpuspeed\":500,\"memory\":512,\"guestosid\":\"88acb71a-f503-11e7-a402-0242ac110003\",\"rootdeviceid\":0,\"rootdevicetype\":\"ROOT\",\"securitygroup\":[],\"nic\":[{\"id\":\"674aeb81-c153-4b39-b462-85d47c304efc\",\"networkid\":\"95b8b9cf-fd93-4601-b037-915b2bf5d5a2\",\"networkname\":\"ggg\",\"netmask\":\"255.255.255.0\",\"gateway\":\"10.1.1.1\",\"ipaddress\":\"10.1.1.19\",\"isolationuri\":\"vlan://103\",\"broadcasturi\":\"vlan://103\",\"traffictype\":\"Guest\",\"type\":\"Isolated\",\"isdefault\":true,\"macaddress\":\"02:00:0f:71:00:01\",\"secondaryip\":[]},{\"id\":\"ace7cb25-6b7a-4315-b519-59d1fde5666f\",\"networkid\":\"a72d1fb8-c754-42f2-8bad-295084c4f981\",\"networkname\":\"hhhh\",\"netmask\":\"255.255.255.0\",\"gateway\":\"10.1.1.1\",\"ipaddress\":\"10.1.1.109\",\"isolationuri\":\"vlan://197\",\"broadcasturi\":\"vlan://197\",\"traffictype\":\"Guest\",\"type\":\"Isolated\",\"isdefault\":false,\"macaddress\":\"02:00:45:47:00:01\",\"secondaryip\":[]}],\"hypervisor\":\"Simulator\",\"details\":{},\"affinitygroup\":[],\"displayvm\":true,\"isdynamicallyscalable\":false,\"ostypeid\":142,\"tags\":[],\"jobid\":\"2c9bd9c7-11e1-4354-abb5-2c619fbb4589\",\"jobstatus\":0}",
+          |  "resultCode": "0",
+          |  "instanceUuid": "991558d9-5dfe-4272-85aa-98cbf7c10830",
+          |  "user": "9e476079-af42-4a55-9880-e9811595a104",
+          |  "command": "org.apache.cloudstack.api.command.user.vm.DeployVMCmd",
+          |  "account": "67d724b9-d104-4f5c-ba1c-a2aa3d39632f",
+          |  "status": "SUCCEEDED"
+          |}
+        """.stripMargin,
         VirtualMachineCreateEvent(
-          status = Some(Statuses.SCHEDULED),
-          eventDateTime = Some(OffsetDateTime.of(2017, 11, 12, 13, 36, 23, 0, ZoneOffset.ofHours(7))), //scalastyle:ignore
+          status = Some(Statuses.SUCCEEDED),
+          eventDateTime = None,
           jobResult = Some(JobResult("org.apache.cloudstack.api.response.UserVmResponse/virtualmachine/",
             Right(
               VirtualMachineJobResult(
-                id = UUID.fromString("63f55cf9-2d1b-42f0-9202-a784af1d39ed"),
-                account = "Account Name",
-                domainId = UUID.fromString("16d7977e-43fd-47ad-9fff-6ef8d463516f"),
-                serviceOfferingId = UUID.fromString("b1196c0e-0c1a-4416-bea8-f6a62309fac5"),
-                networkInterfaces = Seq.empty
+                id = UUID.fromString("991558d9-5dfe-4272-85aa-98cbf7c10830"),
+                account = "aaa",
+                domainId = UUID.fromString("bcaf64de-56ff-44ef-9f4a-d5959cb3d63b"),
+                serviceOfferingId = UUID.fromString("891b5344-83c6-453a-8521-1cdfa17f920b"),
+                networkInterfaces = Seq(
+                  NetworkInterface(
+                    id = UUID.fromString("674aeb81-c153-4b39-b462-85d47c304efc"),
+                    secondaryIps = Seq.empty
+                  ),
+                  NetworkInterface(
+                    id = UUID.fromString("ace7cb25-6b7a-4315-b519-59d1fde5666f"),
+                    secondaryIps = Seq.empty
+                  )
+                ),
+                memory = 512 //scalastyle:ignore
               ))))
         )
       ),

diff --git a/src/test/scala/com/bwsw/cloudstack/entities/dao/TestData.scala b/src/test/scala/com/bwsw/cloudstack/entities/dao/TestData.scala
@@ -27,6 +27,8 @@ import com.bwsw.cloudstack.entities.responses.account.Account
 import com.bwsw.cloudstack.entities.responses.user.User
 import com.bwsw.cloudstack.entities.responses.vm.VirtualMachine
 
+import scala.util.Random
+
 trait TestData {
   private val retryDelay = 1000
   val executorSettings = Executor.Settings(Array("localhost:9000"), retryDelay)
@@ -89,6 +91,7 @@ trait TestData {
     serviceOfferingId = UUID.randomUUID(),
     accountName = accountName,
     domainId = domainId,
-    networkInterfaces = Seq.empty
+    networkInterfaces = Seq.empty,
+    memory = Random.nextInt(Int.MaxValue).toLong
   )
 }