refactor and additional data

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/VeeamControlService.java

@@ -43,9 +43,8 @@ public interface VeeamControlService extends PluggableService, Configurable {
             "change-me", "Password for Basic Auth on Veeam Integration REST API server", true);
     ConfigKey<String> ServiceAccountId = new ConfigKey<>("Advanced", String.class,
             "integration.veeam.control.service.account", "",
-            "ID of the service account used to perform operations on resources. " +
-                    "Preferably an admin-level account with permissions to access resources across the environment " +
-                    "and optionally assign them to other users.",
+            "ID of the service account that the Veeam Control Service uses to perform operations on " +
+                    "resources.This account should be a Root-Admin.",
             true);
     ConfigKey<Boolean> InstanceRestoreAssignOwner = new ConfigKey<>("Advanced", Boolean.class,
             "integration.veeam.control.instance.restore.assign.owner",

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/converter/UserVmJoinVOToVmConverter.java

@@ -173,6 +173,9 @@ public static Vm toVm(final UserVmJoinVO src,
                 basePath + ApiRouteHandler.BASE_ROUTE + "/cpuprofiles/" + src.getServiceOfferingUuid(),
                 src.getServiceOfferingUuid()));
 
+        dst.setInstanceId(src.getUuid());
+        dst.setInstanceName(src.getInstanceName());
+        dst.setInstanceGroupId(src.getInstanceGroupUuid());
         dst.setAccountId(src.getAccountUuid());
         dst.setAffinityGroupId(src.getAffinityGroupUuid());
         dst.setUserDataId(src.getUserDataUuid());

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/OvfXmlUtil.java

@@ -418,6 +418,9 @@ private static void addCloudStackMetadata(Vm vm, UserVmJoinVO vo, StringBuilder
             sb.append("<Section xsi:type=\"ovf:CloudStackMetadata_Type\">");
             sb.append("<Info>CloudStack specific metadata</Info>");
             sb.append("<CloudStack>");
+            sb.append("<InstanceId>").append(vm.getInstanceId()).append("</InstanceId>");
+            sb.append("<InstanceName>").append(vm.getInstanceName()).append("</InstanceName>");
+            sb.append("<InstanceGroupId>").append(vm.getInstanceGroupId()).append("</InstanceGroupId>");
             sb.append("<AccountId>").append(vo.getAccountUuid()).append("</AccountId>");
             sb.append("<DomainId>").append(vo.getDomainUuid()).append("</DomainId>");
             sb.append("<ProjectId>").append(escapeText(vo.getProjectUuid())).append("</ProjectId>");
@@ -799,6 +802,18 @@ private static void updateFromXmlCloudStackMetadataSection(Vm vm, Node metadataS
         if (metadataSection == null) {
             return;
         }
+        String instanceId = xpathString(xpath, metadataSection, ".//*[local-name()='InstanceId']/text()");
+        if (StringUtils.isNotBlank(instanceId)) {
+            vm.setInstanceId(instanceId);
+        }
+        String instanceName = xpathString(xpath, metadataSection, ".//*[local-name()='InstanceName']/text()");
+        if (StringUtils.isNotBlank(instanceName)) {
+            vm.setInstanceName(instanceName);
+        }
+        String instanceGroupId = xpathString(xpath, metadataSection, ".//*[local-name()='InstanceGroupId']/text()");
+        if (StringUtils.isNotBlank(instanceGroupId)) {
+            vm.setInstanceGroupId(instanceGroupId);
+        }
         String serviceOfferingId = xpathString(xpath, metadataSection, ".//*[local-name()='ServiceOfferingId']/text()");
         if (StringUtils.isNotBlank(serviceOfferingId)) {
             vm.setCpuProfile(Ref.of("", serviceOfferingId));

plugins/integrations/veeam-control-service/src/main/java/org/apache/cloudstack/veeam/api/dto/Vm.java

@@ -79,6 +79,9 @@ public final class Vm extends BaseDto {
     public EmptyElement display = new EmptyElement();
 
     // CloudStack-specific fields
+    private String instanceId;
+    private String instanceName;
+    private String instanceGroupId;
     private String accountId;
     private String affinityGroupId;
     private String userDataId;
@@ -299,6 +302,33 @@ public void setCpuProfile(Ref cpuProfile) {
         this.cpuProfile = cpuProfile;
     }
 
+    @JsonIgnore
+    public String getInstanceId() {
+        return instanceId;
+    }
+
+    public void setInstanceId(String instanceId) {
+        this.instanceId = instanceId;
+    }
+
+    @JsonIgnore
+    public String getInstanceName() {
+        return instanceName;
+    }
+
+    public void setInstanceName(String instanceName) {
+        this.instanceName = instanceName;
+    }
+
+    @JsonIgnore
+    public String getInstanceGroupId() {
+        return instanceGroupId;
+    }
+
+    public void setInstanceGroupId(String instanceGroupId) {
+        this.instanceGroupId = instanceGroupId;
+    }
+
     @JsonIgnore
     public String getAccountId() {
         return accountId;

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

@@ -2757,6 +2757,8 @@ private Volume orchestrateAttachVolumeToVM(Long vmId, Long volumeId, Long device
         return newVol;
     }
 
+    @Override
+    @ActionEvent(eventType = EventTypes.EVENT_VOLUME_ATTACH, eventDescription = "attaching volume", async = true)
     public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId, Boolean allowAttachForSharedFS) {
         Account caller = CallContext.current().getCallingAccount();