Merge branch 'c-3' into 'zsv_4.10.28'

<test>[storage]: remove CreateVmInstance.dataDiskOfferingUuids usage

See merge request zstackio/zstack!9065

Author: gitlab

test/src/test/groovy/org/zstack/test/integration/db/deadlock/BatchCreateVmFailDeadlockCase.groovy

@@ -51,17 +51,6 @@ class BatchCreateVmFailDeadlockCase extends SubCase{
     @Override
     void environment() {
         env = env {
-            instanceOffering {
-                name = "instanceOffering"
-                memory = SizeUnit.GIGABYTE.toByte(1)
-                cpu = 1
-            }
-
-            diskOffering {
-                name = "diskOffering"
-                    diskSize = SizeUnit.GIGABYTE.toByte(1)
-            }
-
             sftpBackupStorage {
                 name = "sftp"
                 url = "/sftp"
@@ -163,10 +152,8 @@ class BatchCreateVmFailDeadlockCase extends SubCase{
     }
 
     void testBatchCreateVm() {
-        InstanceOfferingInventory instanceOffering = env.inventoryByName("instanceOffering")
         L3NetworkInventory l3 = env.inventoryByName("l3")
         ImageInventory image = env.inventoryByName("iso")
-        DiskOfferingInventory diskOffering = env.inventoryByName("diskOffering")
 
         env.afterSimulator(FlatDhcpBackend.BATCH_APPLY_DHCP_PATH) {FlatDhcpBackend.ApplyDhcpRsp rsp, HttpEntity<java.lang.String> e ->
             Random r = new Random()
@@ -187,12 +174,20 @@ class BatchCreateVmFailDeadlockCase extends SubCase{
             def thread = Thread.start {
                 CreateVmInstanceAction action = new CreateVmInstanceAction(
                         name : "test-" + i,
-                        instanceOfferingUuid : instanceOffering.uuid,
+                        cpuNum: 1,
+                        memorySize: gb(1),
                         l3NetworkUuids : [l3.uuid],
                         imageUuid : image.uuid,
-                        rootDiskOfferingUuid : diskOffering.uuid,
-                        dataDiskOfferingUuids: [diskOffering.uuid],
                         sessionId: Test.currentEnvSpec.session.uuid,
+                        diskAOs: [
+                            [
+                                "boot" : true,
+                                "size" : gb(1),
+                            ],
+                            [
+                                "size" : gb(1),
+                            ]
+                        ]
                 )
 
                 CreateVmInstanceAction.Result ret = action.call()

test/src/test/groovy/org/zstack/test/integration/kvm/vm/BatchCreateVmFailOnLocalStorageCase.groovy

@@ -30,17 +30,6 @@ class BatchCreateVmFailOnLocalStorageCase extends SubCase{
     @Override
     void environment() {
         env = env {
-            instanceOffering {
-                name = "instanceOffering"
-                memory = SizeUnit.GIGABYTE.toByte(1)
-                cpu = 1
-            }
-
-            diskOffering {
-                name = "diskOffering"
-                    diskSize = SizeUnit.GIGABYTE.toByte(1)
-            }
-
             sftpBackupStorage {
                 name = "sftp"
                 url = "/sftp"
@@ -125,10 +114,8 @@ class BatchCreateVmFailOnLocalStorageCase extends SubCase{
         PrimaryStorageGlobalConfig.RESERVED_CAPACITY.updateValue(0)
 
         PrimaryStorageInventory ps = env.inventoryByName("local")
-        InstanceOfferingInventory instanceOffering = env.inventoryByName("instanceOffering")
         L3NetworkInventory l3 = env.inventoryByName("l3")
         ImageInventory image = env.inventoryByName("iso")
-        DiskOfferingInventory diskOffering = env.inventoryByName("diskOffering")
 
         AtomicInteger errorNum = new AtomicInteger(0)
 
@@ -140,11 +127,19 @@ class BatchCreateVmFailOnLocalStorageCase extends SubCase{
             def thread = Thread.start {
                 CreateVmInstanceAction action = new CreateVmInstanceAction(
                         name : "test-" + i,
-                        instanceOfferingUuid : instanceOffering.uuid,
+                        cpuNum: 1,
+                        memorySize: gb(1),
                         l3NetworkUuids : [l3.uuid],
                         imageUuid : image.uuid,
-                        dataDiskOfferingUuids: [diskOffering.uuid],
-                        sessionId: Test.currentEnvSpec.session.uuid
+                        sessionId: Test.currentEnvSpec.session.uuid,
+                        diskAOs: [
+                            [
+                                "boot" : true,
+                            ],
+                            [
+                                "size" : gb(1),
+                            ]
+                        ]
                 )
 
                 CreateVmInstanceAction.Result ret = action.call()

test/src/test/groovy/org/zstack/test/integration/storage/primary/local_nfs/VmOperationMultyTypeStorageCase.groovy

@@ -3,7 +3,6 @@ package org.zstack.test.integration.storage.primary.local_nfs
 import org.zstack.header.storage.primary.PrimaryStorageStateEvent
 import org.zstack.sdk.AttachDataVolumeToVmAction
 import org.zstack.sdk.CreateVmInstanceAction
-import org.zstack.sdk.DiskOfferingInventory
 import org.zstack.sdk.ImageInventory
 import org.zstack.sdk.InstanceOfferingInventory
 import org.zstack.sdk.L3NetworkInventory
@@ -48,25 +47,28 @@ class VmOperationMultyTypeStorageCase extends SubCase{
 
     void testCreateVmChooseNfs(){
         PrimaryStorageInventory nfs = env.inventoryByName("nfs") as PrimaryStorageInventory
-        InstanceOfferingInventory ins = env.inventoryByName("instanceOffering") as InstanceOfferingInventory
         ImageInventory image = env.inventoryByName("image") as ImageInventory
         L3NetworkInventory l3 = env.inventoryByName("l3") as L3NetworkInventory
 
         CreateVmInstanceAction a = new CreateVmInstanceAction()
         a.name = "vm"
-        a.instanceOfferingUuid = ins.uuid
+        a.cpuNum = 4
+        a.memorySize = gb(8)
         a.imageUuid = image.uuid
         a.l3NetworkUuids = [l3.uuid]
-        a.primaryStorageUuidForRootVolume = nfs.uuid
         a.sessionId = currentEnvSpec.session.uuid
+        a.diskAOs = [
+            [
+                "boot" : true,
+                "primaryStorageUuid" : nfs.uuid,
+            ]
+        ]
 
         assert a.call().error == null
     }
 
     void testDisableNfsPrimaryStorageThenCreateVmInstance(){
         PrimaryStorageInventory nfs = env.inventoryByName("nfs") as PrimaryStorageInventory
-        InstanceOfferingInventory ins = env.inventoryByName("instanceOffering") as InstanceOfferingInventory
-        DiskOfferingInventory diskOfferingInventory = env.inventoryByName("diskOffering")
         ImageInventory image = env.inventoryByName("image") as ImageInventory
         L3NetworkInventory l3 = env.inventoryByName("l3") as L3NetworkInventory
 
@@ -77,11 +79,20 @@ class VmOperationMultyTypeStorageCase extends SubCase{
 
         CreateVmInstanceAction a = new CreateVmInstanceAction()
         a.name = "vm1"
-        a.instanceOfferingUuid = ins.uuid
+        a.cpuNum = 4
+        a.memorySize = gb(8)
         a.imageUuid = image.uuid
         a.l3NetworkUuids = [l3.uuid]
-        a.dataDiskOfferingUuids = [diskOfferingInventory.uuid]
         a.sessionId = currentEnvSpec.session.uuid
+        a.diskAOs = [
+            [
+                "boot" : true,
+            ],
+            [
+                "boot" : false,
+                "size" : gb(20),
+            ]
+        ]
 
         CreateVmInstanceAction.Result result = a.call()
         assert result.error == null
@@ -95,7 +106,6 @@ class VmOperationMultyTypeStorageCase extends SubCase{
     void testDisableNfsPrimaryStorageThenAttachDataVolumeToVm(){
         PrimaryStorageInventory nfs = env.inventoryByName("nfs") as PrimaryStorageInventory
         InstanceOfferingInventory ins = env.inventoryByName("instanceOffering") as InstanceOfferingInventory
-        DiskOfferingInventory diskOfferingInventory = env.inventoryByName("diskOffering")
         ImageInventory image = env.inventoryByName("image") as ImageInventory
         L3NetworkInventory l3 = env.inventoryByName("l3") as L3NetworkInventory
 
@@ -108,12 +118,13 @@ class VmOperationMultyTypeStorageCase extends SubCase{
             name = "vm2"
             imageUuid = image.uuid
             l3NetworkUuids = [l3.uuid]
-            instanceOfferingUuid = ins.uuid
+            cpuNum = 4
+            memorySize = gb(8)
         }
 
         VolumeInventory volume = createDataVolume {
             name = "data"
-            diskOfferingUuid = diskOfferingInventory.uuid
+            diskSize = gb(20)
         }
 
         changePrimaryStorageState {