Azure: Add more VM image info

cloud-barista · Dec 26, 2024 · 302e333 · 302e333
1 parent cbdc9af
commit 302e333
Show file tree

Hide file tree

Showing 4 changed files with 167 additions and 111 deletions.
diff --git a/cloud-control-manager/cloud-driver/drivers/azure/main/Test_Resources.go b/cloud-control-manager/cloud-driver/drivers/azure/main/Test_Resources.go
@@ -29,7 +29,7 @@ type Config struct {
 		Zone      string `yaml:"zone"`
 		Resources struct {
 			Image struct {
-				NameId string `yaml:"nameId"`
+				Name string `yaml:"name"`
 			} `yaml:"image"`
 			Security struct {
 				NameId string `yaml:"nameId"`
@@ -80,9 +80,9 @@ type Config struct {
 				IID struct {
 					NameId string `yaml:"nameId"`
 				} `yaml:"IID"`
-				ImageIID struct {
-					NameId string `yaml:"nameId"`
-				} `yaml:"ImageIID"`
+				Image struct {
+					Name string `yaml:"name"`
+				} `yaml:"Image"`
 				ImageType  string `yaml:"ImageType"`
 				VmSpecName string `yaml:"VmSpecName"`
 				KeyPairIID struct {
@@ -248,7 +248,7 @@ func testImageHandler(config Config) {
 
 	testImageHandlerListPrint()
 
-	imageIID := irs.IID{NameId: config.Azure.Resources.Image.NameId}
+	imageName := config.Azure.Resources.Image.Name
 
 Loop:
 	for {
@@ -272,7 +272,7 @@ Loop:
 				cblogger.Info("Finish ListImage()")
 			case 2:
 				cblogger.Info("Start GetImage() ...")
-				if imageInfo, err := imageHandler.GetImage(imageIID); err != nil {
+				if imageInfo, err := imageHandler.GetImage(imageName); err != nil {
 					cblogger.Error(err)
 				} else {
 					spew.Dump(imageInfo)
@@ -787,7 +787,7 @@ func testVMHandler(config Config) {
 		},
 		ImageType: imageType,
 		ImageIID: irs.IID{
-			NameId: config.Azure.Resources.Vm.ImageIID.NameId,
+			NameId: config.Azure.Resources.Vm.Image.Name,
 		},
 		VpcIID: irs.IID{
 			NameId: config.Azure.Resources.Vm.VpcIID.NameId,

diff --git a/cloud-control-manager/cloud-driver/drivers/azure/main/conf/config.yaml.sample b/cloud-control-manager/cloud-driver/drivers/azure/main/conf/config.yaml.sample
@@ -7,7 +7,7 @@ azure:
   zone: TBD
   resources:
     image:
-      nameId: Canonical:UbuntuServer:18.04-LTS:18.04.201804262
+      name: Canonical:UbuntuServer:18.04-LTS:18.04.201804262
     security:
       nameId: mcb-test-sg
       VpcIID:
@@ -48,8 +48,8 @@ azure:
     vm:
       IID:
         nameId: mcb-test-vm
-      ImageIID:
-        nameId: imageid
+      Image:
+        name: imageName
 #        nameId: Canonical:UbuntuServer:18.04-LTS:18.04.201804262
       ImageType: MyImage
       VmSpecName: Standard_B1ls