Merge branch '2574-ip-SSVM-rede-storage' into '4.20.0.0-scclouds'

Adição de informação do endereço IP da SSVM na rede de _storage_

Closes apache#2574

See merge request scclouds/scclouds!1182

Author: SadiJr

api/src/main/java/org/apache/cloudstack/api/response/SystemVmResponse.java

@@ -134,6 +134,10 @@ public class SystemVmResponse extends BaseResponseWithAnnotations {
     @Param(description = "the public netmask for the system VM")
     private String publicNetmask;
 
+    @SerializedName("storagenetworkip")
+    @Param(description = "the ip for the system VM on the storage network")
+    private String storageNetworkIp;
+
     @SerializedName("templateid")
     @Param(description = "the template ID for the system VM")
     private String templateId;
@@ -359,6 +363,14 @@ public void setPublicNetmask(String publicNetmask) {
         this.publicNetmask = publicNetmask;
     }
 
+    public String getStorageNetworkIp() {
+        return storageNetworkIp;
+    }
+
+    public void setStorageNetworkIp(String storageNetworkIp) {
+        this.storageNetworkIp = storageNetworkIp;
+    }
+
     public String getTemplateId() {
         return templateId;
     }

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -1855,6 +1855,8 @@ public SystemVmResponse createSystemVmResponse(VirtualMachine vm) {
                             vmResponse.setPublicNetmask(singleNicProfile.getIPv4Netmask());
                             vmResponse.setGateway(singleNicProfile.getIPv4Gateway());
                         }
+                    } else if (network.getTrafficType() == TrafficType.Storage) {
+                        vmResponse.setStorageNetworkIp(singleNicProfile.getIPv4Address());
                     }
                 }
             }

ui/public/locales/en.json

@@ -2260,6 +2260,7 @@
 "label.storagepool.tooltip": "Destination Storage Pool. Volume should be located in this Storage Pool",
 "label.storagetags": "Storage tags",
 "label.storagetype": "Storage type",
+"label.storagenetworkip": "Storage network IP",
 "label.strict": "Strict",
 "label.subdomainaccess": "Subdomain access",
 "label.submit": "Submit",

ui/public/locales/pt_BR.json

@@ -1651,6 +1651,7 @@
 "label.storagepool": "Pool de armazenamento",
 "label.storagetags": "Tags de armazenamento",
 "label.storagetype": "Tipo de armazenamento",
+"label.storagenetworkip": "IP na rede de storage",
 "label.strict": "Rigoroso",
 "label.subdomainaccess": "acesso ao subdom\u00ednio",
 "label.submit": "Enviar",

ui/src/config/section/infra/systemVms.js

@@ -26,7 +26,7 @@ export default {
   permission: ['listSystemVms'],
   searchFilters: ['name', 'zoneid', 'podid', 'hostid', 'systemvmtype', 'storageid'],
   columns: ['name', 'state', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'version', 'hostname', 'zonename'],
-  details: ['name', 'id', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'gateway', 'hostname', 'version', 'zonename', 'created', 'activeviewersessions', 'isdynamicallyscalable', 'hostcontrolstate'],
+  details: ['name', 'id', 'agentstate', 'systemvmtype', 'publicip', 'privateip', 'linklocalip', 'gateway', 'hostname', 'version', 'zonename', 'created', 'activeviewersessions', 'isdynamicallyscalable', 'hostcontrolstate', 'storagenetworkip'],
   resourceType: 'SystemVm',
   filters: () => {
     const filters = ['starting', 'running', 'stopping', 'stopped', 'destroyed', 'expunging', 'migrating', 'error', 'unknown', 'shutdown']