diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
index 15a31d48db1c..36af1ee7148a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateStaticRouteCmd.java
@@ -46,7 +46,6 @@ public class CreateStaticRouteCmd extends BaseAsyncCreateCmd {
     @Parameter(name = ApiConstants.GATEWAY_ID,
                type = CommandType.UUID,
                entityType = PrivateGatewayResponse.class,
-               required = true,
                description = "The gateway ID we are creating static route for. Mutually exclusive with the nexthop parameter")
     private Long gatewayId;
 
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 31144296f602..51b28e6e2f95 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2326,7 +2326,8 @@ public void prepareAllNicsForMigration(final VirtualMachineProfile vm, final Dep
             for (final NetworkElement element : networkElements) {
                 if (providersToImplement.contains(element.getProvider())) {
                     if (!_networkModel.isProviderEnabledInPhysicalNetwork(_networkModel.getPhysicalNetworkId(network), element.getProvider().getName())) {
-                        throw new CloudRuntimeException(String.format("Service provider %s either doesn't exist or is not enabled in physical network: %s", element.getProvider().getName(), _physicalNetworkDao.findById(network.getPhysicalNetworkId())));
+                        throw new CloudRuntimeException(String.format("Service provider %s either doesn't exist or is not enabled in physical network: %s",
+                                element.getProvider().getName(), _physicalNetworkDao.findById(network.getPhysicalNetworkId())));
                     }
                     if (element instanceof NetworkMigrationResponder) {
                         if (!((NetworkMigrationResponder) element).prepareMigration(profile, network, vm, dest, context)) {
@@ -2633,6 +2634,10 @@ && isDhcpAccrossMultipleSubnetsSupported(dhcpServiceProvider)) {
 
         final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName());
         guru.deallocate(network, profile, vm);
+        if (nic.getReservationStrategy() == Nic.ReservationStrategy.Create) {
+            applyProfileToNicForRelease(nic, profile);
+            _nicDao.update(nic.getId(), nic);
+        }
         if (BooleanUtils.isNotTrue(preserveNics)) {
             _nicDao.remove(nic.getId());
         }
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql
index 54baf226ac43..505c8ef5715d 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210-cleanup.sql
@@ -18,3 +18,5 @@
 --;
 -- Schema upgrade cleanup from 4.22.0.0 to 4.22.1.0
 --;
+
+DROP VIEW IF EXISTS `cloud`.`account_netstats_view`;
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql
deleted file mode 100644
index 11193c465fd7..000000000000
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_netstats_view.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---   http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- cloud.account_netstats_view source
-
-
-DROP VIEW IF EXISTS `cloud`.`account_netstats_view`;
-
-CREATE VIEW `cloud`.`account_netstats_view` AS
-select
-    `user_statistics`.`account_id` AS `account_id`,
-    (sum(`user_statistics`.`net_bytes_received`) + sum(`user_statistics`.`current_bytes_received`)) AS `bytesReceived`,
-    (sum(`user_statistics`.`net_bytes_sent`) + sum(`user_statistics`.`current_bytes_sent`)) AS `bytesSent`
-from
-    `user_statistics`
-group by
-    `user_statistics`.`account_id`;
diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql
index edc164c40cbd..327c6c627e22 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.account_view.sql
@@ -39,8 +39,8 @@ select
     `data_center`.`id` AS `data_center_id`,
     `data_center`.`uuid` AS `data_center_uuid`,
     `data_center`.`name` AS `data_center_name`,
-    `account_netstats_view`.`bytesReceived` AS `bytesReceived`,
-    `account_netstats_view`.`bytesSent` AS `bytesSent`,
+    `account_netstats`.`bytesReceived` AS `bytesReceived`,
+    `account_netstats`.`bytesSent` AS `bytesSent`,
     `vmlimit`.`max` AS `vmLimit`,
     `vmcount`.`count` AS `vmTotal`,
     `runningvm`.`vmcount` AS `runningVms`,
@@ -89,8 +89,15 @@ from
     `cloud`.`domain` ON account.domain_id = domain.id
         left join
     `cloud`.`data_center` ON account.default_zone_id = data_center.id
-        left join
-    `cloud`.`account_netstats_view` ON account.id = account_netstats_view.account_id
+        left join lateral (
+        select
+            coalesce(sum(`user_statistics`.`net_bytes_received` + `user_statistics`.`current_bytes_received`), 0) AS `bytesReceived`,
+            coalesce(sum(`user_statistics`.`net_bytes_sent` + `user_statistics`.`current_bytes_sent`), 0) AS `bytesSent`
+        from
+            `cloud`.`user_statistics`
+        where
+            `user_statistics`.`account_id` = `account`.`id`
+    ) AS `account_netstats` ON TRUE
         left join
     `cloud`.`resource_limit` vmlimit ON account.id = vmlimit.account_id
         and vmlimit.type = 'user_vm' and vmlimit.tag IS NULL
diff --git a/plugins/maintenance/src/test/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImplTest.java b/plugins/maintenance/src/test/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImplTest.java
index 280d1eaf9eb9..a208893f6d1b 100644
--- a/plugins/maintenance/src/test/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImplTest.java
+++ b/plugins/maintenance/src/test/java/org/apache/cloudstack/maintenance/ManagementServerMaintenanceManagerImplTest.java
@@ -321,7 +321,6 @@ public void prepareForMaintenanceAndCancelFromMaintenanceState() {
             spy.prepareForMaintenance("static", false);
         });
 
-        Mockito.when(msHost.getState()).thenReturn(ManagementServerHost.State.Maintenance);
         Mockito.doNothing().when(jobManagerMock).enableAsyncJobs();
         spy.cancelMaintenance();
         Mockito.verify(jobManagerMock).enableAsyncJobs();
@@ -339,7 +338,6 @@ public void prepareForMaintenanceAndCancelFromPreparingForMaintenanceState() {
             spy.prepareForMaintenance("static", false);
         });
 
-        Mockito.when(msHost.getState()).thenReturn(ManagementServerHost.State.PreparingForMaintenance);
         Mockito.doNothing().when(jobManagerMock).enableAsyncJobs();
         spy.cancelMaintenance();
         Mockito.verify(jobManagerMock).enableAsyncJobs();
diff --git a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
index 3ddd6a0fd9a8..ff810ef92312 100755
--- a/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
+++ b/server/src/main/java/com/cloud/template/TemplateManagerImpl.java
@@ -2381,6 +2381,9 @@ private VMTemplateVO updateTemplateOrIso(BaseUpdateTemplateOrIsoCmd cmd) {
 
     @Override
     public TemplateType validateTemplateType(BaseCmd cmd, boolean isAdmin, boolean isCrossZones, HypervisorType hypervisorType) {
+        if (cmd instanceof GetUploadParamsForIsoCmd) {
+            return TemplateType.USER;
+        }
         if (!(cmd instanceof UpdateTemplateCmd) && !(cmd instanceof RegisterTemplateCmd) && !(cmd instanceof GetUploadParamsForTemplateCmd)) {
             return null;
         }
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index f36c851e5bb3..49761905f004 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -4408,7 +4408,7 @@ private UserVm getUncheckedUserVmResource(DataCenter zone, String hostName, Stri
                 }
             }
 
-            if (template.getTemplateType().equals(TemplateType.SYSTEM) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
+            if (TemplateType.SYSTEM.equals(template.getTemplateType()) && !CKS_NODE.equals(vmType) && !SHAREDFSVM.equals(vmType)) {
                 throw new InvalidParameterValueException(String.format("Unable to use system template %s to deploy a user vm", template));
             }
 
diff --git a/ui/src/views/compute/DeployVM.vue b/ui/src/views/compute/DeployVM.vue
index 1966203e7dd7..88521861f18e 100644
--- a/ui/src/views/compute/DeployVM.vue
+++ b/ui/src/views/compute/DeployVM.vue
@@ -459,6 +459,9 @@
                     :value="securitygroupids"
                     :loading="loading.networks"
                     :preFillContent="dataPreFill"
+                    :domainId="owner.domainid"
+                    :account="owner.account"
+                    :projectId="owner.projectid"
                     @select-security-group-item="($event) => updateSecurityGroups($event)"></security-group-selection>
                 </template>
               </a-step>
@@ -1501,6 +1504,9 @@ export default {
       return tabList
     },
     showSecurityGroupSection () {
+      if (this.zone && this.zone.networktype === 'Basic') {
+        return true
+      }
       if (this.networks.length < 1) {
         return false
       }
diff --git a/ui/src/views/compute/wizard/MultiNetworkSelection.vue b/ui/src/views/compute/wizard/MultiNetworkSelection.vue
index f593d0f3d91e..fb0c58e475e1 100644
--- a/ui/src/views/compute/wizard/MultiNetworkSelection.vue
+++ b/ui/src/views/compute/wizard/MultiNetworkSelection.vue
@@ -1,19 +1,10 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
+// Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE
+file // distributed with this work for additional information // regarding copyright ownership. The ASF licenses this
+file // to you under the Apache License, Version 2.0 (the // "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // //
+Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on
+an // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY // KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations // under the License.
 
 <template>
   <div>
@@ -21,11 +12,11 @@
       :loading="loading"
       :columns="columns"
       :dataSource="tableSource"
-      :rowKey="record => record.id"
+      :rowKey="(record) => record.id"
       :pagination="false"
       :rowSelection="rowSelection"
-      :scroll="{ y: 225 }" >
-
+      :scroll="{ y: 225 }"
+    >
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'name'">
           <span>{{ record.displaytext || record.name }}</span>
@@ -48,16 +39,20 @@
             style="width: 100%"
             v-if="validNetworks[record.id] && validNetworks[record.id].length > 0"
             :defaultValue="getDefaultNetwork(record)"
-            @change="val => handleNetworkChange(record, val)"
+            @change="(val) => handleNetworkChange(record, val)"
             showSearch
             optionFilterProp="label"
-            :filterOption="(input, option) => {
-              return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            }" >
+            :filterOption="
+              (input, option) => {
+                return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+              }
+            "
+          >
             <a-select-option
               v-for="network in hypervisor !== 'KVM' ? validNetworks[record.id] : networks"
               :key="network.id"
-              :label="network.displaytext + (network.broadcasturi ? ' (' + network.broadcasturi + ')' : '')">
+              :label="network.displaytext + (network.broadcasturi ? ' (' + network.broadcasturi + ')' : '')"
+            >
               <div>{{ network.displaytext + (network.broadcasturi ? ' (' + network.broadcasturi + ')' : '') }}</div>
             </a-select-option>
           </a-select>
@@ -72,8 +67,9 @@
             :checkBoxLabel="$t('label.auto.assign.random.ip')"
             :defaultCheckBoxValue="true"
             :reversed="true"
-            :visible="(indexNum > 0 && ipAddressesEnabled[record.id])"
-            @handle-checkinputpair-change="setIpAddress" />
+            :visible="indexNum > 0 && ipAddressesEnabled[record.id]"
+            @handle-checkinputpair-change="setIpAddress"
+          />
         </template>
       </template>
     </a-table>
@@ -107,6 +103,10 @@ export default {
       type: String,
       default: ''
     },
+    projectid: {
+      type: String,
+      default: ''
+    },
     selectionEnabled: {
       type: Boolean,
       default: true
@@ -158,7 +158,7 @@ export default {
   },
   computed: {
     tableSource () {
-      return this.items.map(item => {
+      return this.items.map((item) => {
         var nic = { ...item, disabled: this.validNetworks[item.id] && this.validNetworks[item.id].length === 0 }
         nic.name = item.displaytext || item.name
         return nic
@@ -169,7 +169,7 @@ export default {
         return {
           type: 'checkbox',
           selectedRowKeys: this.selectedRowKeys,
-          getCheckboxProps: record => ({
+          getCheckboxProps: (record) => ({
             props: {
               disabled: record.disabled
             }
@@ -201,6 +201,9 @@ export default {
           this.fetchNetworks()
         }
       }, 750)
+    },
+    projectid () {
+      this.fetchNetworks()
     }
   },
   created () {
@@ -221,14 +224,20 @@ export default {
         params.domainid = this.domainid
         params.account = this.account
       }
-      getAPI('listNetworks', params).then(response => {
-        this.networks = response.listnetworksresponse.network || []
-      }).catch(() => {
-        this.networks = []
-      }).finally(() => {
-        this.orderNetworks()
-        this.loading = false
-      })
+      if (this.projectid) {
+        params.projectid = this.projectid
+      }
+      getAPI('listNetworks', params)
+        .then((response) => {
+          this.networks = response.listnetworksresponse.network || []
+        })
+        .catch(() => {
+          this.networks = []
+        })
+        .finally(() => {
+          this.orderNetworks()
+          this.loading = false
+        })
     },
     orderNetworks () {
       this.loading = true
@@ -236,13 +245,16 @@ export default {
       for (const item of this.items) {
         this.validNetworks[item.id] = this.networks
         if (this.filterUnimplementedNetworks) {
-          this.validNetworks[item.id] = this.validNetworks[item.id].filter(x => (x.state === 'Implemented' || (x.state === 'Setup' && ['Shared', 'L2'].includes(x.type))))
+          this.validNetworks[item.id] = this.validNetworks[item.id].filter(
+            (x) => x.state === 'Implemented' || (x.state === 'Setup' && ['Shared', 'L2'].includes(x.type))
+          )
         }
         if (this.filterMatchKey) {
-          const filtered = this.networks.filter(x => x[this.filterMatchKey] === item[this.filterMatchKey])
+          const filtered = this.networks.filter((x) => x[this.filterMatchKey] === item[this.filterMatchKey])
           if (this.hypervisor === 'KVM') {
             this.unableToMatch = filtered.length === 0
-            this.validNetworks[item.id] = filtered.length === 0 ? this.networks : filtered.concat(this.networks.filter(x => filtered.includes(x)))
+            this.validNetworks[item.id] =
+              filtered.length === 0 ? this.networks : filtered.concat(this.networks.filter((x) => filtered.includes(x)))
           } else {
             this.validNetworks[item.id] = filtered
           }
@@ -253,7 +265,7 @@ export default {
     },
     setIpAddressEnabled (nic, network) {
       this.ipAddressesEnabled[nic.id] = network && network.type !== 'L2'
-      this.ipAddresses[nic.id] = (!network || network.type === 'L2') ? null : 'auto'
+      this.ipAddresses[nic.id] = !network || network.type === 'L2' ? null : 'auto'
       this.values[nic.id] = network ? network.id : null
       this.indexNum = (this.indexNum % 2) + 1
     },
@@ -267,7 +279,7 @@ export default {
       for (const item of this.items) {
         let network = null
         if (item.vlanid && item.vlanid !== -1) {
-          const matched = this.validNetworks[item.id].filter(x => Number(x.vlan) === item.vlanid)
+          const matched = this.validNetworks[item.id].filter((x) => Number(x.vlan) === item.vlanid)
           if (matched.length > 0) {
             network = matched[0]
           }
@@ -276,16 +288,22 @@ export default {
           network = this.validNetworks[item.id]?.[0] || null
         }
         this.values[item.id] = network ? network.id : ''
-        this.ipAddresses[item.id] = (!network || network.type === 'L2') ? null : 'auto'
+        this.ipAddresses[item.id] = !network || network.type === 'L2' ? null : 'auto'
         this.setIpAddressEnabled(item, network)
       }
       this.sendValuesTimed()
     },
     handleNetworkChange (nic, networkId) {
       if (this.hypervisor === 'KVM') {
-        this.setIpAddressEnabled(nic, _.find(this.networks, (option) => option.id === networkId))
+        this.setIpAddressEnabled(
+          nic,
+          _.find(this.networks, (option) => option.id === networkId)
+        )
       } else {
-        this.setIpAddressEnabled(nic, _.find(this.validNetworks[nic.id], (option) => option.id === networkId))
+        this.setIpAddressEnabled(
+          nic,
+          _.find(this.validNetworks[nic.id], (option) => option.id === networkId)
+        )
       }
       this.sendValuesTimed()
     },
@@ -301,7 +319,7 @@ export default {
     sendValues () {
       const data = {}
       if (this.selectionEnabled) {
-        this.selectedRowKeys.map(x => {
+        this.selectedRowKeys.map((x) => {
           var d = { network: this.values[x] }
           if (this.ipAddresses[x]) {
             d.ipAddress = this.ipAddresses[x]
@@ -324,7 +342,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  .ant-table-wrapper {
-    margin: 2rem 0;
-  }
+.ant-table-wrapper {
+  margin: 2rem 0;
+}
 </style>
diff --git a/ui/src/views/compute/wizard/SecurityGroupSelection.vue b/ui/src/views/compute/wizard/SecurityGroupSelection.vue
index 9d91cc1cbe19..0ea08ec8887d 100644
--- a/ui/src/views/compute/wizard/SecurityGroupSelection.vue
+++ b/ui/src/views/compute/wizard/SecurityGroupSelection.vue
@@ -75,6 +75,18 @@ export default {
     preFillContent: {
       type: Object,
       default: () => {}
+    },
+    domainId: {
+      type: String,
+      default: () => ''
+    },
+    account: {
+      type: String,
+      default: () => ''
+    },
+    projectId: {
+      type: String,
+      default: () => ''
     }
   },
   data () {
@@ -102,6 +114,9 @@ export default {
     }
   },
   computed: {
+    ownerParams () {
+      return `${this.domainId}-${this.account}-${this.projectId}`
+    },
     rowSelection () {
       return {
         type: 'checkbox',
@@ -121,6 +136,11 @@ export default {
         this.selectedRowKeys = newValue
       }
     },
+    ownerParams () {
+      this.selectedRowKeys = []
+      this.$emit('select-security-group-item', null)
+      this.fetchData()
+    },
     loading () {
       if (!this.loading) {
         if (this.preFillContent.securitygroupids) {
@@ -140,9 +160,9 @@ export default {
   methods: {
     fetchData () {
       const params = {
-        projectid: this.$store.getters.project ? this.$store.getters.project.id : null,
-        domainid: this.$store.getters.project && this.$store.getters.project.id ? null : this.$store.getters.userInfo.domainid,
-        account: this.$store.getters.project && this.$store.getters.project.id ? null : this.$store.getters.userInfo.account,
+        projectid: this.projectId || (this.$store.getters.project ? this.$store.getters.project.id : null),
+        domainid: this.projectId || (this.$store.getters.project && this.$store.getters.project.id) ? null : (this.domainId || this.$store.getters.userInfo.domainid),
+        account: this.projectId || (this.$store.getters.project && this.$store.getters.project.id) ? null : (this.account || this.$store.getters.userInfo.account),
         page: this.page,
         pageSize: this.pageSize
       }
diff --git a/ui/src/views/image/TemplateZones.vue b/ui/src/views/image/TemplateZones.vue
index e517aad5167d..31b65e556a4b 100644
--- a/ui/src/views/image/TemplateZones.vue
+++ b/ui/src/views/image/TemplateZones.vue
@@ -91,7 +91,7 @@
           :rowKey="record => record.datastoreId">
           <template #bodyCell="{ text, record, column }">
             <template v-if="column.dataIndex === 'datastore' && record.datastoreId">
-                <router-link :to="{ path: '/storagepool/' + encodeURIComponent(record.datastoreId) }">
+              <router-link :to="{ path: '/storagepool/' + encodeURIComponent(record.datastoreId) }">
                 {{ text }}
               </router-link>
             </template>
@@ -107,7 +107,7 @@
           :rowKey="record => record.datastoreId">
           <template #bodyCell="{ text, record, column }">
             <template v-if="column.dataIndex === 'datastore' && record.datastoreId">
-                <router-link :to="{ path: '/imagestore/' + record.datastoreId }">
+              <router-link :to="{ path: '/imagestore/' + record.datastoreId }">
                 {{ text }}
               </router-link>
             </template>
@@ -217,7 +217,9 @@
           <a-alert type="error">
             <template #message>
               <exclamation-circle-outlined style="color: red; fontSize: 30px; display: inline-flex" />
-              <span style="padding-left: 5px" v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" />
+              <span
+                style="padding-left: 5px"
+                v-html="`<b>${selectedRowKeys.length} ` + $t('label.items.selected') + `. </b>`" />
               <span v-html="$t(message.confirmMessage)" />
             </template>
           </a-alert>
@@ -391,10 +393,10 @@ export default {
   },
   computed: {
     isActionsOnTemplatePermitted () {
-      return (['Admin'].includes(this.$store.getters.userInfo.roletype) || // If admin or owner or belongs to current project
+      return (['Admin'].includes(this.$store.getters.userInfo.roletype) ||
         (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.account === this.$store.getters.userInfo.account) ||
         (this.resource.domainid === this.$store.getters.userInfo.domainid && this.resource.projectid && this.$store.getters.project && this.$store.getters.project.id && this.resource.projectid === this.$store.getters.project.id)) &&
-        (this.resource.isready || !this.resource.status || this.resource.status.indexOf('Downloaded') === -1) && // Template is ready or downloaded
+        (this.resource.isready || !this.resource.status || this.resource.status.indexOf('Downloaded') === -1) &&
         this.resource.templatetype !== 'SYSTEM'
     }
   },
@@ -476,7 +478,7 @@ export default {
       this.showTable = false
       this.fetchData()
       if (this.dataSource.length === 0) {
-        this.$router.go(-1)
+        this.$router.push({ path: '/template' })
       }
     },
     getOkProps () {
diff --git a/ui/src/views/network/CreateNetwork.vue b/ui/src/views/network/CreateNetwork.vue
index 05fd7cbd5a6c..46ed9d2e039f 100644
--- a/ui/src/views/network/CreateNetwork.vue
+++ b/ui/src/views/network/CreateNetwork.vue
@@ -106,7 +106,7 @@ export default {
     fetchActionZoneData () {
       this.loading = true
       const params = {}
-      if (this.resource.zoneid && (this.$route.name === 'deployVirtualMachine' || this.$route.path.startsWith('/backup'))) {
+      if (this.resource?.zoneid && (this.$route.name === 'deployVirtualMachine' || this.$route.path.startsWith('/backup'))) {
         params.id = this.resource.zoneid
       }
       this.actionZoneLoading = true
diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue
index 4f6aaef4445d..4a689f13c34d 100644
--- a/ui/src/views/network/VpcTiersTab.vue
+++ b/ui/src/views/network/VpcTiersTab.vue
@@ -193,8 +193,14 @@
               optionFilterProp="label"
               :filterOption="(input, option) => {
                 return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-              }" >
-              <a-select-option v-for="item in networkOfferings" :key="item.id" :value="item.id" :label="item.displaytext || item.name || item.description">
+              }"
+               >
+              <a-select-option
+                v-for="item in networkOfferings"
+                :key="item.id"
+                :value="item.id"
+                :label="item.displaytext || item.name || item.description"
+                :title="item.displaytext || item.name || item.description">
                 {{ item.displaytext || item.name || item.description }}
               </a-select-option>
             </a-select>
diff --git a/ui/src/views/tools/ImportUnmanagedInstance.vue b/ui/src/views/tools/ImportUnmanagedInstance.vue
index 1d5bec8be744..0266d0ae1f06 100644
--- a/ui/src/views/tools/ImportUnmanagedInstance.vue
+++ b/ui/src/views/tools/ImportUnmanagedInstance.vue
@@ -1,19 +1,10 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
+// Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE
+file // distributed with this work for additional information // regarding copyright ownership. The ASF licenses this
+file // to you under the Apache License, Version 2.0 (the // "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // //
+Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on
+an // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY // KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations // under the License.
 
 <template>
   <div>
@@ -24,16 +15,12 @@
             class="vm-info-card"
             :isStatic="true"
             :resource="resource"
-            :title="$t('label.unmanaged.instance')" />
+            :title="$t('label.unmanaged.instance')"
+          />
         </a-col>
         <a-col :md="24" :lg="17">
           <a-card :bordered="true">
-            <a-form
-              :ref="formRef"
-              :model="form"
-              :rules="rules"
-              @finish="handleSubmit"
-              layout="vertical">
+            <a-form :ref="formRef" :model="form" :rules="rules" @finish="handleSubmit" layout="vertical">
               <a-alert
                 v-if="selectedVmwareVcenter && isVmRunning"
                 type="warning"
@@ -42,39 +29,45 @@
               />
               <a-form-item name="displayname" ref="displayname">
                 <template #label>
-                  <tooltip-label :title="$t('label.displayname')" :tooltip="apiParams.displayname.description"/>
+                  <tooltip-label :title="$t('label.displayname')" :tooltip="apiParams.displayname.description" />
                 </template>
                 <a-input
                   v-model:value="form.displayname"
                   :placeholder="apiParams.displayname.description"
                   ref="displayname"
-                  v-focus="true" />
+                  v-focus="true"
+                />
               </a-form-item>
               <a-form-item name="hostname" ref="hostname">
                 <template #label>
-                  <tooltip-label :title="$t('label.hostnamelabel')" :tooltip="apiParams.hostname.description"/>
+                  <tooltip-label :title="$t('label.hostnamelabel')" :tooltip="apiParams.hostname.description" />
                 </template>
-                <a-input
-                  v-model:value="form.hostname"
-                  :placeholder="apiParams.hostname.description" />
+                <a-input v-model:value="form.hostname" :placeholder="apiParams.hostname.description" />
               </a-form-item>
               <a-form-item name="domainid" ref="domainid">
                 <template #label>
-                  <tooltip-label :title="$t('label.domainid')" :tooltip="apiParams.domainid.description"/>
+                  <tooltip-label :title="$t('label.domainid')" :tooltip="apiParams.domainid.description" />
                 </template>
                 <a-select
                   v-model:value="form.domainid"
                   showSearch
                   optionFilterProp="label"
-                  :filterOption="(input, option) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  }"
+                  :filterOption="
+                    (input, option) => {
+                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }
+                  "
                   :loading="optionsLoading.domains"
                   :placeholder="apiParams.domainid.description"
-                  @change="val => { this.selectedDomainId = val }">
+                  @change="
+                    (val) => {
+                      this.selectedDomainId = val
+                    }
+                  "
+                >
                   <a-select-option v-for="dom in domainSelectOptions" :key="dom.value" :label="dom.label">
                     <span>
-                      <resource-icon v-if="dom.icon" :image="dom.icon" size="1x" style="margin-right: 5px"/>
+                      <resource-icon v-if="dom.icon" :image="dom.icon" size="1x" style="margin-right: 5px" />
                       <block-outlined v-else-if="dom.value !== null" style="margin-right: 5px" />
                       {{ dom.label }}
                     </span>
@@ -83,42 +76,50 @@
               </a-form-item>
               <a-form-item name="account" ref="account" v-if="selectedDomainId">
                 <template #label>
-                  <tooltip-label :title="$t('label.account')" :tooltip="apiParams.account.description"/>
+                  <tooltip-label :title="$t('label.account')" :tooltip="apiParams.account.description" />
                 </template>
-                <a-input
-                  v-model:value="form.account"
-                  :placeholder="apiParams.account.description"/>
+                <a-input v-model:value="form.account" :placeholder="apiParams.account.description" />
               </a-form-item>
               <a-form-item name="projectid" ref="projectid">
                 <template #label>
-                  <tooltip-label :title="$t('label.project')" :tooltip="apiParams.projectid.description"/>
+                  <tooltip-label :title="$t('label.project')" :tooltip="apiParams.projectid.description" />
                 </template>
                 <a-select
                   v-model:value="form.projectid"
                   showSearch
                   optionFilterProp="label"
-                  :filterOption="(input, option) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  }"
+                  :filterOption="
+                    (input, option) => {
+                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }
+                  "
                   :loading="optionsLoading.projects"
-                  :placeholder="apiParams.projectid.description">
+                  :placeholder="apiParams.projectid.description"
+                >
                   <a-select-option v-for="proj in projectSelectOptions" :key="proj.value" :label="proj.label">
                     <span>
-                      <resource-icon v-if="proj.icon" :image="proj.icon" size="1x" style="margin-right: 5px"/>
-                      <project-outlined  v-else-if="proj.value !== null" style="margin-right: 5px" />
+                      <resource-icon v-if="proj.icon" :image="proj.icon" size="1x" style="margin-right: 5px" />
+                      <project-outlined v-else-if="proj.value !== null" style="margin-right: 5px" />
                       {{ proj.label }}
                     </span>
                   </a-select-option>
                 </a-select>
               </a-form-item>
-              <a-form-item name="templateid" ref="templateid" v-if="cluster.hypervisortype === 'VMware' || (cluster.hypervisortype === 'KVM' && !selectedVmwareVcenter && !isDiskImport && !isExternalImport)">
+              <a-form-item
+                name="templateid"
+                ref="templateid"
+                v-if="
+                  cluster.hypervisortype === 'VMware' ||
+                  (cluster.hypervisortype === 'KVM' && !selectedVmwareVcenter && !isDiskImport && !isExternalImport)
+                "
+              >
                 <template #label>
-                  <tooltip-label :title="$t('label.templatename')" :tooltip="apiParams.templateid.description + '. ' + $t('message.template.import.vm.temporary')"/>
+                  <tooltip-label
+                    :title="$t('label.templatename')"
+                    :tooltip="apiParams.templateid.description + '. ' + $t('message.template.import.vm.temporary')"
+                  />
                 </template>
-                <a-radio-group
-                  style="width:100%"
-                  :value="templateType"
-                  @change="changeTemplateType">
+                <a-radio-group style="width: 100%" :value="templateType" @change="changeTemplateType">
                   <a-row :gutter="12">
                     <a-col :md="24" :lg="12" v-if="this.cluster.hypervisortype === 'VMware'">
                       <a-radio value="auto">
@@ -131,19 +132,28 @@
                       </a-radio>
                       <a-select
                         :disabled="templateType === 'auto'"
-                        style="margin-top:10px"
+                        style="margin-top: 10px"
                         v-model:value="form.templateid"
                         showSearch
                         optionFilterProp="label"
-                        :filterOption="(input, option) => {
-                          return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                        }"
+                        :filterOption="
+                          (input, option) => {
+                            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                          }
+                        "
                         :loading="optionsLoading.templates"
-                        :placeholder="apiParams.templateid.description">
+                        :placeholder="apiParams.templateid.description"
+                      >
                         <a-select-option v-for="temp in templateSelectOptions" :key="temp.value" :label="temp.label">
                           <span>
-                            <resource-icon v-if="temp.icon" :image="temp.icon" size="1x" style="margin-right: 5px"/>
-                            <os-logo v-else-if="temp.value !== null" :osId="temp.ostypeid" :osName="temp.ostypename" size="lg" style="margin-left: -1px" />
+                            <resource-icon v-if="temp.icon" :image="temp.icon" size="1x" style="margin-right: 5px" />
+                            <os-logo
+                              v-else-if="temp.value !== null"
+                              :osId="temp.ostypeid"
+                              :osName="temp.ostypename"
+                              size="lg"
+                              style="margin-left: -1px"
+                            />
                             {{ temp.label }}
                           </span>
                         </a-select-option>
@@ -154,7 +164,10 @@
               </a-form-item>
               <a-form-item name="forceconverttopool" ref="forceconverttopool" v-if="selectedVmwareVcenter">
                 <template #label>
-                  <tooltip-label :title="$t('label.force.convert.to.pool')" :tooltip="apiParams.forceconverttopool.description"/>
+                  <tooltip-label
+                    :title="$t('label.force.convert.to.pool')"
+                    :tooltip="apiParams.forceconverttopool.description"
+                  />
                 </template>
                 <a-switch v-model:checked="form.forceconverttopool" @change="onForceConvertToPoolChange" />
               </a-form-item>
@@ -188,7 +201,11 @@
                   v-if="cluster.hypervisortype === 'KVM' && selectedVmwareVcenter"
                   :resourceKey="cluster.id"
                   :selectOptions="storageOptionsForConversion"
-                  :checkBoxLabel="switches.forceConvertToPool ? $t('message.select.destination.storage.instance.conversion') : $t('message.select.temporary.storage.instance.conversion')"
+                  :checkBoxLabel="
+                    switches.forceConvertToPool
+                      ? $t('message.select.destination.storage.instance.conversion')
+                      : $t('message.select.temporary.storage.instance.conversion')
+                  "
                   :defaultCheckBoxValue="false"
                   :reversed="false"
                   @handle-checkselectpair-change="updateSelectedStorageOptionForConversion"
@@ -205,11 +222,18 @@
                   defaultActiveFirstOption
                   showSearch
                   optionFilterProp="label"
-                  :filterOption="(input, option) => {
-                    return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                  }"
-                  @change="val => { selectedStoragePoolForConversion = val }">
-                  <a-select-option v-for="(pool) in storagePoolsForConversion" :key="pool.id" :label="pool.name">
+                  :filterOption="
+                    (input, option) => {
+                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                    }
+                  "
+                  @change="
+                    (val) => {
+                      selectedStoragePoolForConversion = val
+                    }
+                  "
+                >
+                  <a-select-option v-for="pool in storagePoolsForConversion" :key="pool.id" :label="pool.name">
                     {{ pool.name }}
                   </a-select-option>
                 </a-select>
@@ -217,7 +241,8 @@
               <a-form-item name="extraparams" ref="extraparams">
                 <a-checkbox
                   v-if="cluster.hypervisortype === 'KVM' && selectedVmwareVcenter && vmwareToKvmExtraParamsAllowed"
-                  v-model:checked="vmwareToKvmExtraParamsSelected">
+                  v-model:checked="vmwareToKvmExtraParamsSelected"
+                >
                   {{ $t('message.select.extra.parameters.for.instance.conversion') }}
                 </a-checkbox>
                 <a-input
@@ -228,13 +253,26 @@
               </a-form-item>
               <a-form-item name="forcemstoimportvmfiles" ref="forcemstoimportvmfiles" v-if="selectedVmwareVcenter">
                 <template #label>
-                  <tooltip-label :title="$t('label.force.ms.to.import.vm.files')" :tooltip="apiParams.forcemstoimportvmfiles.description"/>
+                  <tooltip-label
+                    :title="$t('label.force.ms.to.import.vm.files')"
+                    :tooltip="apiParams.forcemstoimportvmfiles.description"
+                  />
                 </template>
-                <a-switch v-model:checked="form.forcemstoimportvmfiles" @change="val => { switches.forceMsToImportVmFiles = val }" />
+                <a-switch
+                  v-model:checked="form.forcemstoimportvmfiles"
+                  @change="
+                    (val) => {
+                      switches.forceMsToImportVmFiles = val
+                    }
+                  "
+                />
               </a-form-item>
               <a-form-item name="serviceofferingid" ref="serviceofferingid">
                 <template #label>
-                  <tooltip-label :title="$t('label.serviceofferingid')" :tooltip="apiParams.serviceofferingid.description"/>
+                  <tooltip-label
+                    :title="$t('label.serviceofferingid')"
+                    :tooltip="apiParams.serviceofferingid.description"
+                  />
                 </template>
                 <compute-offering-selection
                   :compute-items="computeOfferings"
@@ -247,7 +285,8 @@
                   :allowAllOfferings="selectedVmwareVcenter ? true : false"
                   size="small"
                   @select-compute-item="($event) => updateComputeOffering($event)"
-                  @handle-search-filter="($event) => fetchComputeOfferings($event)" />
+                  @handle-search-filter="($event) => fetchComputeOfferings($event)"
+                />
                 <compute-selection
                   class="row-element"
                   v-if="computeOffering && (computeOffering.iscustomized || computeOffering.iscustomizediops)"
@@ -267,12 +306,16 @@
                   @update-iops-value="updateFieldValue"
                   @update-compute-cpunumber="updateFieldValue"
                   @update-compute-cpuspeed="updateCpuSpeed"
-                  @update-compute-memory="updateFieldValue" />
+                  @update-compute-memory="updateFieldValue"
+                />
               </a-form-item>
               <div v-if="resource.disk && resource.disk.length > 1">
                 <a-form-item name="selection" ref="selection">
                   <template #label>
-                    <tooltip-label :title="$t('label.disk.selection')" :tooltip="apiParams.datadiskofferinglist.description"/>
+                    <tooltip-label
+                      :title="$t('label.disk.selection')"
+                      :tooltip="apiParams.datadiskofferinglist.description"
+                    />
                   </template>
                 </a-form-item>
                 <a-form-item name="rootdiskid" ref="rootdiskid" :label="$t('label.select.root.disk')">
@@ -281,18 +324,22 @@
                     defaultActiveFirstOption
                     showSearch
                     optionFilterProp="label"
-                    :filterOption="(input, option) => {
-                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    }"
-                    @change="onSelectRootDisk">
-                    <a-select-option v-for="(opt, optIndex) in resource.disk" :key="optIndex" :label="opt.label || opt.id">
+                    :filterOption="
+                      (input, option) => {
+                        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                    "
+                    @change="onSelectRootDisk"
+                  >
+                    <a-select-option
+                      v-for="(opt, optIndex) in resource.disk"
+                      :key="optIndex"
+                      :label="opt.label || opt.id"
+                    >
                       {{ opt.label || opt.id }}
                     </a-select-option>
                   </a-select>
-                  <a-table
-                    :columns="selectedRootDiskColumns"
-                    :dataSource="selectedRootDiskSources"
-                    :pagination="false">
+                  <a-table :columns="selectedRootDiskColumns" :dataSource="selectedRootDiskSources" :pagination="false">
                     <template #bodyCell="{ column, record }">
                       <template v-if="column.key === 'name'">
                         <span>{{ record.displaytext || record.name }}</span>
@@ -313,12 +360,16 @@
                   :autoSelectCustomOffering="true"
                   :isKVMUnmanage="isKVMUnmanage"
                   :autoSelectLabel="$t('label.auto.assign.diskoffering.disk.size')"
-                  @select-multi-disk-offering="updateMultiDiskOffering" />
+                  @select-multi-disk-offering="updateMultiDiskOffering"
+                />
               </div>
               <div v-if="resource.nic && resource.nic.length > 0">
                 <a-form-item name="networkselection" ref="networkselection">
                   <template #label>
-                    <tooltip-label :title="$t('label.network.selection')" :tooltip="apiParams.nicnetworklist.description"/>
+                    <tooltip-label
+                      :title="$t('label.network.selection')"
+                      :tooltip="apiParams.nicnetworklist.description"
+                    />
                   </template>
                   <span>{{ $t('message.ip.address.changes.effect.after.vm.restart') }}</span>
                 </a-form-item>
@@ -328,9 +379,17 @@
                       <template #label>
                         <tooltip-label
                           :title="$t('label.allow.duplicate.macaddresses')"
-                          :tooltip="apiParams.forced.description"/>
+                          :tooltip="apiParams.forced.description"
+                        />
                       </template>
-                      <a-switch v-model:checked="form.forced" @change="val => { switches.forced = val }" />
+                      <a-switch
+                        v-model:checked="form.forced"
+                        @change="
+                          (val) => {
+                            switches.forced = val
+                          }
+                        "
+                      />
                     </a-form-item>
                   </a-col>
                 </a-row>
@@ -339,13 +398,15 @@
                   :zoneId="cluster.zoneid"
                   :domainid="form.domainid"
                   :account="form.account"
+                  :projectid="form.projectid"
                   :selectionEnabled="false"
                   :filterUnimplementedNetworks="true"
                   :hypervisor="this.cluster.hypervisortype"
                   :filterMatchKey="isKVMUnmanage ? undefined : 'broadcasturi'"
-                  @select-multi-network="updateMultiNetworkOffering" />
+                  @select-multi-network="updateMultiNetworkOffering"
+                />
               </div>
-              <a-row v-else style="margin: 12px 0" >
+              <a-row v-else style="margin: 12px 0">
                 <div v-if="!isExternalImport && !isDiskImport">
                   <a-alert type="warning">
                     <template #message>
@@ -357,17 +418,24 @@
               <div v-if="isDiskImport">
                 <a-form-item name="networkid" ref="networkid">
                   <template #label>
-                    <tooltip-label :title="$t('label.network')"/>
+                    <tooltip-label :title="$t('label.network')" />
                   </template>
                   <a-select
                     v-model:value="form.networkid"
                     showSearch
                     optionFilterProp="label"
-                    :filterOption="(input, option) => {
-                      return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-                    }"
-                    :loading="optionsLoading.networks">
-                    <a-select-option v-for="network in networkSelectOptions" :key="network.value" :label="network.label">
+                    :filterOption="
+                      (input, option) => {
+                        return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
+                      }
+                    "
+                    :loading="optionsLoading.networks"
+                  >
+                    <a-select-option
+                      v-for="network in networkSelectOptions"
+                      :key="network.value"
+                      :label="network.label"
+                    >
                       <span>
                         {{ network.label }}
                       </span>
@@ -379,19 +447,34 @@
                 <a-col :md="24" :lg="12">
                   <a-form-item name="migrateallowed" ref="migrateallowed">
                     <template #label>
-                      <tooltip-label :title="$t('label.migrate.allowed')" :tooltip="apiParams.migrateallowed.description"/>
+                      <tooltip-label
+                        :title="$t('label.migrate.allowed')"
+                        :tooltip="apiParams.migrateallowed.description"
+                      />
                     </template>
-                    <a-switch v-model:checked="form.migrateallowed" @change="val => { switches.migrateAllowed = val }" />
+                    <a-switch
+                      v-model:checked="form.migrateallowed"
+                      @change="
+                        (val) => {
+                          switches.migrateAllowed = val
+                        }
+                      "
+                    />
                   </a-form-item>
                 </a-col>
                 <a-col>
                   <a-form-item name="forced" ref="forced">
                     <template #label>
-                      <tooltip-label
-                        :title="$t('label.forced')"
-                        :tooltip="apiParams.forced.description"/>
+                      <tooltip-label :title="$t('label.forced')" :tooltip="apiParams.forced.description" />
                     </template>
-                    <a-switch v-model:checked="form.forced" @change="val => { switches.forced = val }" />
+                    <a-switch
+                      v-model:checked="form.forced"
+                      @change="
+                        (val) => {
+                          switches.forced = val
+                        }
+                      "
+                    />
                   </a-form-item>
                 </a-col>
               </a-row>
@@ -535,7 +618,8 @@ export default {
         {
           id: 'secondary',
           name: 'Secondary Storage'
-        }, {
+        },
+        {
           id: 'primary',
           name: 'Primary Storage'
         }
@@ -560,11 +644,11 @@ export default {
   beforeCreate () {
     this.apiConfig = this.$store.getters.apis.importUnmanagedInstance || {}
     this.apiParams = {}
-    this.apiConfig.params.forEach(param => {
+    this.apiConfig.params.forEach((param) => {
       this.apiParams[param.name] = param
     })
     this.apiConfig = this.$store.getters.apis.importVm || {}
-    this.apiConfig.params.forEach(param => {
+    this.apiConfig.params.forEach((param) => {
       if (!(param.name in this.apiParams)) {
         this.apiParams[param.name] = param
       }
@@ -636,7 +720,11 @@ export default {
       return false
     },
     isKVMUnmanage () {
-      return this.hypervisor && this.hypervisor === 'kvm' && (this.importsource === 'unmanaged' || this.importsource === 'external')
+      return (
+        this.hypervisor &&
+        this.hypervisor === 'kvm' &&
+        (this.importsource === 'unmanaged' || this.importsource === 'external')
+      )
     },
     domainSelectOptions () {
       var domains = this.options.domains.map((domain) => {
@@ -698,7 +786,11 @@ export default {
             var disk = { ...this.resource.disk[index] }
             disk.size = disk.capacity / (1024 * 1024 * 1024)
             disk.name = disk.label
-            disk.meta = this.getMeta(disk, { controller: 'controller', datastorename: 'datastore', position: 'position' })
+            disk.meta = this.getMeta(disk, {
+              controller: 'controller',
+              datastorename: 'datastore',
+              position: 'position'
+            })
             disks.push(disk)
           }
         }
@@ -781,7 +873,7 @@ export default {
       const params = {
         name: 'convert.vmware.instance.to.kvm.extra.params.allowed'
       }
-      getAPI('listConfigurations', params).then(json => {
+      getAPI('listConfigurations', params).then((json) => {
         if (json.listconfigurationsresponse.configuration !== null) {
           const config = json.listconfigurationsresponse.configuration[0]
           if (config && config.name === params.name) {
@@ -803,25 +895,33 @@ export default {
       if (this.isVmRunning) {
         return this.resource.cpunumber
       }
-      return 'serviceofferingdetails' in this.computeOffering ? this.computeOffering.serviceofferingdetails.mincpunumber * 1 : 1
+      return 'serviceofferingdetails' in this.computeOffering
+        ? this.computeOffering.serviceofferingdetails.mincpunumber * 1
+        : 1
     },
     getMinMemory () {
       if (this.isVmRunning) {
         return this.resource.memory
       }
-      return 'serviceofferingdetails' in this.computeOffering ? this.computeOffering.serviceofferingdetails.minmemory * 1 : 32
+      return 'serviceofferingdetails' in this.computeOffering
+        ? this.computeOffering.serviceofferingdetails.minmemory * 1
+        : 32
     },
     getMaxCpu () {
       if (this.isVmRunning) {
         return this.resource.cpunumber
       }
-      return 'serviceofferingdetails' in this.computeOffering ? this.computeOffering.serviceofferingdetails.maxcpunumber * 1 : Number.MAX_SAFE_INTEGER
+      return 'serviceofferingdetails' in this.computeOffering
+        ? this.computeOffering.serviceofferingdetails.maxcpunumber * 1
+        : Number.MAX_SAFE_INTEGER
     },
     getMaxMemory () {
       if (this.isVmRunning) {
         return this.resource.memory
       }
-      return 'serviceofferingdetails' in this.computeOffering ? this.computeOffering.serviceofferingdetails.maxmemory * 1 : Number.MAX_SAFE_INTEGER
+      return 'serviceofferingdetails' in this.computeOffering
+        ? this.computeOffering.serviceofferingdetails.maxmemory * 1
+        : Number.MAX_SAFE_INTEGER
     },
     getCPUSpeed () {
       if (!this.computeOffering) {
@@ -845,32 +945,35 @@ export default {
       if (!('listall' in options)) {
         options.listall = true
       }
-      getAPI(param.list, options).then((response) => {
-        param.loading = false
-        _.map(response, (responseItem, responseKey) => {
-          if (Object.keys(responseItem).length === 0) {
-            this.rowCount[name] = 0
-            this.options[name] = []
-            return
-          }
-          if (!responseKey.includes('response')) {
-            return
-          }
-          _.map(responseItem, (response, key) => {
-            if (key === 'count') {
-              this.rowCount[name] = response
+      getAPI(param.list, options)
+        .then((response) => {
+          param.loading = false
+          _.map(response, (responseItem, responseKey) => {
+            if (Object.keys(responseItem).length === 0) {
+              this.rowCount[name] = 0
+              this.options[name] = []
+              return
+            }
+            if (!responseKey.includes('response')) {
               return
             }
-            param.opts = response
-            this.options[name] = response
+            _.map(responseItem, (response, key) => {
+              if (key === 'count') {
+                this.rowCount[name] = response
+                return
+              }
+              param.opts = response
+              this.options[name] = response
+            })
           })
         })
-      }).catch(function (error) {
-        console.log(error.stack)
-        param.loading = false
-      }).finally(() => {
-        this.optionsLoading[name] = false
-      })
+        .catch(function (error) {
+          console.log(error.stack)
+          param.loading = false
+        })
+        .finally(() => {
+          this.optionsLoading[name] = false
+        })
     },
     fetchComputeOfferings (options) {
       this.computeOfferingLoading = true
@@ -883,17 +986,21 @@ export default {
         pageSize: options.pageSize,
         details: 'min',
         response: 'json'
-      }).then(response => {
-        this.totalComputeOfferings = response.listserviceofferingsresponse.count
-        if (this.totalComputeOfferings === 0) {
-          return
-        }
-        this.computeOfferings = response.listserviceofferingsresponse.serviceoffering
-        this.computeOfferings.map(i => { this.offeringsMap[i.id] = i })
-      }).finally(() => {
-        this.computeOfferingLoading = false
-        this.selectMatchingComputeOffering()
       })
+        .then((response) => {
+          this.totalComputeOfferings = response.listserviceofferingsresponse.count
+          if (this.totalComputeOfferings === 0) {
+            return
+          }
+          this.computeOfferings = response.listserviceofferingsresponse.serviceoffering
+          this.computeOfferings.map((i) => {
+            this.offeringsMap[i.id] = i
+          })
+        })
+        .finally(() => {
+          this.computeOfferingLoading = false
+          this.selectMatchingComputeOffering()
+        })
     },
     updateCpuSpeed (name, value) {
       if (this.computeOffering.iscustomized) {
@@ -909,7 +1016,7 @@ export default {
     },
     updateComputeOffering (id) {
       this.updateFieldValue('computeofferingid', id)
-      this.computeOffering = this.computeOfferings.filter(x => x.id === id)[0]
+      this.computeOffering = this.computeOfferings.filter((x) => x.id === id)[0]
       if (this.computeOffering && !this.computeOffering.iscustomizediops) {
         this.updateFieldValue(this.minIopsKey, undefined)
         this.updateFieldValue(this.maxIopsKey, undefined)
@@ -954,10 +1061,12 @@ export default {
         } else {
           cpuNumberMatches = cpuSpeedMatches = memoryMatches = true
           if (offering.serviceofferingdetails) {
-            cpuNumberMatches = (this.resource.cpunumber >= offering.serviceofferingdetails.mincpunumber &&
-              this.resource.cpunumber <= offering.serviceofferingdetails.maxcpunumber)
-            memoryMatches = (this.resource.memory >= offering.serviceofferingdetails.minmemory &&
-              this.resource.memory <= offering.serviceofferingdetails.maxmemory)
+            cpuNumberMatches =
+              this.resource.cpunumber >= offering.serviceofferingdetails.mincpunumber &&
+              this.resource.cpunumber <= offering.serviceofferingdetails.maxcpunumber
+            memoryMatches =
+              this.resource.memory >= offering.serviceofferingdetails.minmemory &&
+              this.resource.memory <= offering.serviceofferingdetails.maxmemory
             cpuSpeedMatches = !this.resource.cpuspeed || offering.cpuspeed === this.resource.cpuspeed
           }
         }
@@ -975,12 +1084,18 @@ export default {
         hypervisor: this.cluster.hypervisortype,
         type: 'Routing',
         state: 'Up'
-      }).then(json => {
+      }).then((json) => {
         this.kvmHostsForConversion = json.listhostsresponse.host || []
-        this.kvmHostsForConversion = this.kvmHostsForConversion.filter(host => ['Enabled', 'Disabled'].includes(host.resourcestate))
-        this.kvmHostsForConversion.map(host => {
+        this.kvmHostsForConversion = this.kvmHostsForConversion.filter((host) =>
+          ['Enabled', 'Disabled'].includes(host.resourcestate)
+        )
+        this.kvmHostsForConversion.map((host) => {
           host.name = host.name + ' [Pod=' + host.podname + '] [Cluster=' + host.clustername + ']'
-          if (host.instanceconversionsupported !== null && host.instanceconversionsupported !== undefined && host.instanceconversionsupported) {
+          if (
+            host.instanceconversionsupported !== null &&
+            host.instanceconversionsupported !== undefined &&
+            host.instanceconversionsupported
+          ) {
             host.name = host.name + ' (' + this.$t('label.supported') + ')'
           } else {
             host.name = host.name + ' (' + this.$t('label.not.supported') + ')'
@@ -1001,7 +1116,7 @@ export default {
         type: 'Routing',
         state: 'Up',
         resourcestate: 'Enabled'
-      }).then(json => {
+      }).then((json) => {
         this.kvmHostsForImporting = json.listhostsresponse.host || []
       })
     },
@@ -1012,21 +1127,21 @@ export default {
           status: 'Up'
         }
         if (this.selectedKvmHostForConversion) {
-          const kvmHost = this.kvmHostsForConversion.filter(x => x.id === this.selectedKvmHostForConversion)[0]
+          const kvmHost = this.kvmHostsForConversion.filter((x) => x.id === this.selectedKvmHostForConversion)[0]
           if (kvmHost.clusterid !== this.cluster.id) {
             params.scope = 'ZONE'
           }
         }
-        getAPI('listStoragePools', params).then(json => {
+        getAPI('listStoragePools', params).then((json) => {
           this.storagePoolsForConversion = json.liststoragepoolsresponse.storagepool || []
         })
       } else if (this.selectedStorageOptionForConversion === 'local') {
-        const kvmHost = this.kvmHostsForConversion.filter(x => x.id === this.selectedKvmHostForConversion)[0]
+        const kvmHost = this.kvmHostsForConversion.filter((x) => x.id === this.selectedKvmHostForConversion)[0]
         getAPI('listStoragePools', {
           scope: 'HOST',
           ipaddress: kvmHost.ipaddress,
           status: 'Up'
-        }).then(json => {
+        }).then((json) => {
           this.storagePoolsForConversion = json.liststoragepoolsresponse.storagepool || []
         })
       }
@@ -1042,7 +1157,7 @@ export default {
     updateSelectedKvmHostForConversion (clusterid, checked, value) {
       if (checked) {
         this.selectedKvmHostForConversion = value
-        const kvmHost = this.kvmHostsForConversion.filter(x => x.id === this.selectedKvmHostForConversion)[0]
+        const kvmHost = this.kvmHostsForConversion.filter((x) => x.id === this.selectedKvmHostForConversion)[0]
         if (kvmHost.islocalstorageactive) {
           this.storageOptionsForConversion.push({
             id: 'local',
@@ -1067,10 +1182,14 @@ export default {
       }
     },
     resetStorageOptionsForConversion () {
-      this.storageOptionsForConversion = this.switches.forceConvertToPool ? [] : [{
-        id: 'secondary',
-        name: 'Secondary Storage'
-      }]
+      this.storageOptionsForConversion = this.switches.forceConvertToPool
+        ? []
+        : [
+          {
+            id: 'secondary',
+            name: 'Secondary Storage'
+          }
+        ]
       this.storageOptionsForConversion.push({
         id: 'primary',
         name: 'Primary Storage'
@@ -1088,226 +1207,253 @@ export default {
       var rootDisk = this.resource.disk[this.selectedRootDiskIndex]
       rootDisk.size = rootDisk.capacity / (1024 * 1024 * 1024)
       rootDisk.name = `${rootDisk.label} (${rootDisk.size} GB)`
-      rootDisk.meta = this.getMeta(rootDisk, { controller: 'controller', datastorename: 'datastore', position: 'position' })
+      rootDisk.meta = this.getMeta(rootDisk, {
+        controller: 'controller',
+        datastorename: 'datastore',
+        position: 'position'
+      })
       this.selectedRootDiskSources = [rootDisk]
     },
     handleSubmit (e) {
       e.preventDefault()
       if (this.loading) return
-      this.formRef.value.validate().then(() => {
-        const values = toRaw(this.form)
-        const params = {
-          name: this.resource.name,
-          clusterid: this.cluster.id,
-          displayname: values.displayname,
-          zoneid: this.zoneid,
-          importsource: this.importsource,
-          hypervisor: this.hypervisor,
-          host: this.exthost,
-          hostname: values.hostname,
-          username: this.username,
-          password: this.password,
-          hostid: this.host.id,
-          storageid: this.pool.id,
-          diskpath: this.diskpath,
-          temppath: this.tmppath
-        }
-        var importapi = 'importUnmanagedInstance'
-        if (this.isExternalImport || this.isDiskImport || this.selectedVmwareVcenter) {
-          importapi = 'importVm'
-          if (this.isDiskImport) {
-            if (!values.networkid) {
+      this.formRef.value
+        .validate()
+        .then(() => {
+          const values = toRaw(this.form)
+          const params = {
+            name: this.resource.name,
+            clusterid: this.cluster.id,
+            displayname: values.displayname,
+            zoneid: this.zoneid,
+            importsource: this.importsource,
+            hypervisor: this.hypervisor,
+            host: this.exthost,
+            hostname: values.hostname,
+            username: this.username,
+            password: this.password,
+            hostid: this.host.id,
+            storageid: this.pool.id,
+            diskpath: this.diskpath,
+            temppath: this.tmppath
+          }
+          var importapi = 'importUnmanagedInstance'
+          if (this.isExternalImport || this.isDiskImport || this.selectedVmwareVcenter) {
+            importapi = 'importVm'
+            if (this.isDiskImport) {
+              if (!values.networkid) {
+                this.$notification.error({
+                  message: this.$t('message.request.failed'),
+                  description: this.$t('message.please.enter.valid.value') + ': ' + this.$t('label.network')
+                })
+                return
+              }
+              params.name = values.displayname
+              params.networkid = values.networkid
+            }
+          }
+          if (!this.computeOffering || !this.computeOffering.id) {
+            this.$notification.error({
+              message: this.$t('message.request.failed'),
+              description: this.$t('message.step.2.continue')
+            })
+            return
+          }
+          params.serviceofferingid = values.computeofferingid
+          if (this.computeOffering.iscustomized) {
+            var details = [this.cpuNumberKey, this.cpuSpeedKey, this.memoryKey]
+            for (var detail of details) {
+              if (!(values[detail] || this.computeOffering[detail])) {
+                this.$notification.error({
+                  message: this.$t('message.request.failed'),
+                  description:
+                    this.$t('message.please.enter.valid.value') + ': ' + this.$t('label.' + detail.toLowerCase())
+                })
+                return
+              }
+              if (values[detail]) {
+                params['details[0].' + detail] = values[detail]
+              }
+            }
+          }
+          if (this.computeOffering.iscustomizediops) {
+            var iopsDetails = [this.minIopsKey, this.maxIopsKey]
+            for (var iopsDetail of iopsDetails) {
+              if (!values[iopsDetail] || values[iopsDetail] < 0) {
+                this.$notification.error({
+                  message: this.$t('message.request.failed'),
+                  description:
+                    this.$t('message.please.enter.valid.value') + ': ' + this.$t('label.' + iopsDetail.toLowerCase())
+                })
+                return
+              }
+              params['details[0].' + iopsDetail] = values[iopsDetail]
+            }
+            if (values[this.minIopsKey] > values[this.maxIopsKey]) {
               this.$notification.error({
                 message: this.$t('message.request.failed'),
-                description: this.$t('message.please.enter.valid.value') + ': ' + this.$t('label.network')
+                description: this.$t('error.form.message')
               })
-              return
             }
-            params.name = values.displayname
-            params.networkid = values.networkid
           }
-        }
-        if (!this.computeOffering || !this.computeOffering.id) {
-          this.$notification.error({
-            message: this.$t('message.request.failed'),
-            description: this.$t('message.step.2.continue')
-          })
-          return
-        }
-        params.serviceofferingid = values.computeofferingid
-        if (this.computeOffering.iscustomized) {
-          var details = [this.cpuNumberKey, this.cpuSpeedKey, this.memoryKey]
-          for (var detail of details) {
-            if (!(values[detail] || this.computeOffering[detail])) {
+          if (this.isDiskImport) {
+            var storageType = this.computeOffering.storagetype
+            if (this.importsource !== storageType) {
               this.$notification.error({
                 message: this.$t('message.request.failed'),
-                description: this.$t('message.please.enter.valid.value') + ': ' + this.$t('label.' + detail.toLowerCase())
+                description:
+                  'Incompatible Storage. Import Source is: ' +
+                  this.importsource +
+                  '. Storage Type in service offering is: ' +
+                  storageType
               })
               return
             }
-            if (values[detail]) {
-              params['details[0].' + detail] = values[detail]
+          }
+          if (this.selectedVmwareVcenter) {
+            if (this.selectedVmwareVcenter.existingvcenterid) {
+              params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid
+            } else {
+              params.vcenter = this.selectedVmwareVcenter.vcenter
+              params.datacentername = this.selectedVmwareVcenter.datacentername
+              params.username = this.selectedVmwareVcenter.username
+              params.password = this.selectedVmwareVcenter.password
+            }
+            params.hostip = this.resource.hostname
+            params.clustername = this.resource.clustername
+            if (this.selectedKvmHostForConversion) {
+              params.convertinstancehostid = this.selectedKvmHostForConversion
+            }
+            if (this.selectedKvmHostForImporting) {
+              params.importinstancehostid = this.selectedKvmHostForImporting
+            }
+            if (this.selectedStoragePoolForConversion) {
+              params.convertinstancepoolid = this.selectedStoragePoolForConversion
+            }
+            if (this.vmwareToKvmExtraParams) {
+              params.extraparams = this.vmwareToKvmExtraParams
+            }
+            params.forcemstoimportvmfiles = values.forcemstoimportvmfiles
+            if (values.forceconverttopool) {
+              params.forceconverttopool = values.forceconverttopool
             }
           }
-        }
-        if (this.computeOffering.iscustomizediops) {
-          var iopsDetails = [this.minIopsKey, this.maxIopsKey]
-          for (var iopsDetail of iopsDetails) {
-            if (!values[iopsDetail] || values[iopsDetail] < 0) {
+          var keys = [
+            'hostname',
+            'domainid',
+            'projectid',
+            'account',
+            'migrateallowed',
+            'forced',
+            'forcemstoimportvmfiles'
+          ]
+          if (this.templateType !== 'auto') {
+            keys.push('templateid')
+          }
+          for (var key of keys) {
+            if (values[key]) {
+              params[key] = values[key]
+            }
+          }
+          var diskOfferingIndex = 0
+          for (var diskId in this.dataDisksOfferingsMapping) {
+            if (!this.dataDisksOfferingsMapping[diskId]) {
               this.$notification.error({
                 message: this.$t('message.request.failed'),
-                description: this.$t('message.please.enter.valid.value') + ': ' + this.$t('label.' + iopsDetail.toLowerCase())
+                description: this.$t('message.select.disk.offering') + ': ' + diskId
               })
               return
             }
-            params['details[0].' + iopsDetail] = values[iopsDetail]
-          }
-          if (values[this.minIopsKey] > values[this.maxIopsKey]) {
-            this.$notification.error({
-              message: this.$t('message.request.failed'),
-              description: this.$t('error.form.message')
-            })
-          }
-        }
-        if (this.isDiskImport) {
-          var storageType = this.computeOffering.storagetype
-          if (this.importsource !== storageType) {
-            this.$notification.error({
-              message: this.$t('message.request.failed'),
-              description: 'Incompatible Storage. Import Source is: ' + this.importsource + '. Storage Type in service offering is: ' + storageType
-            })
-            return
-          }
-        }
-        if (this.selectedVmwareVcenter) {
-          if (this.selectedVmwareVcenter.existingvcenterid) {
-            params.existingvcenterid = this.selectedVmwareVcenter.existingvcenterid
-          } else {
-            params.vcenter = this.selectedVmwareVcenter.vcenter
-            params.datacentername = this.selectedVmwareVcenter.datacentername
-            params.username = this.selectedVmwareVcenter.username
-            params.password = this.selectedVmwareVcenter.password
-          }
-          params.hostip = this.resource.hostname
-          params.clustername = this.resource.clustername
-          if (this.selectedKvmHostForConversion) {
-            params.convertinstancehostid = this.selectedKvmHostForConversion
-          }
-          if (this.selectedKvmHostForImporting) {
-            params.importinstancehostid = this.selectedKvmHostForImporting
+            params['datadiskofferinglist[' + diskOfferingIndex + '].disk'] = diskId
+            params['datadiskofferinglist[' + diskOfferingIndex + '].diskOffering'] =
+              this.dataDisksOfferingsMapping[diskId]
+            diskOfferingIndex++
           }
-          if (this.selectedStoragePoolForConversion) {
-            params.convertinstancepoolid = this.selectedStoragePoolForConversion
-          }
-          if (this.vmwareToKvmExtraParams) {
-            params.extraparams = this.vmwareToKvmExtraParams
-          }
-          params.forcemstoimportvmfiles = values.forcemstoimportvmfiles
-          if (values.forceconverttopool) {
-            params.forceconverttopool = values.forceconverttopool
-          }
-        }
-        var keys = ['hostname', 'domainid', 'projectid', 'account', 'migrateallowed', 'forced', 'forcemstoimportvmfiles']
-        if (this.templateType !== 'auto') {
-          keys.push('templateid')
-        }
-        for (var key of keys) {
-          if (values[key]) {
-            params[key] = values[key]
-          }
-        }
-        var diskOfferingIndex = 0
-        for (var diskId in this.dataDisksOfferingsMapping) {
-          if (!this.dataDisksOfferingsMapping[diskId]) {
-            this.$notification.error({
-              message: this.$t('message.request.failed'),
-              description: this.$t('message.select.disk.offering') + ': ' + diskId
-            })
-            return
-          }
-          params['datadiskofferinglist[' + diskOfferingIndex + '].disk'] = diskId
-          params['datadiskofferinglist[' + diskOfferingIndex + '].diskOffering'] = this.dataDisksOfferingsMapping[diskId]
-          diskOfferingIndex++
-        }
-        var nicNetworkIndex = 0
-        var nicIpIndex = 0
-        var networkcheck = new Set()
-        for (var nicId in this.nicsNetworksMapping) {
-          if (!this.nicsNetworksMapping[nicId].network) {
-            this.$notification.error({
-              message: this.$t('message.request.failed'),
-              description: this.$t('message.select.nic.network') + ': ' + nicId
-            })
-            return
-          }
-          params['nicnetworklist[' + nicNetworkIndex + '].nic'] = nicId
-          params['nicnetworklist[' + nicNetworkIndex + '].network'] = this.nicsNetworksMapping[nicId].network
-          var netId = this.nicsNetworksMapping[nicId].network
-          if (!networkcheck.has(netId)) {
-            networkcheck.add(netId)
-          } else {
-            this.$notification.error({
-              message: this.$t('message.request.failed'),
-              description: 'Same network cannot be assigned to multiple Nics'
-            })
-            return
-          }
-          nicNetworkIndex++
-          if ('ipAddress' in this.nicsNetworksMapping[nicId]) {
-            if (!this.nicsNetworksMapping[nicId].ipAddress) {
+          var nicNetworkIndex = 0
+          var nicIpIndex = 0
+          var networkcheck = new Set()
+          for (var nicId in this.nicsNetworksMapping) {
+            if (!this.nicsNetworksMapping[nicId].network) {
               this.$notification.error({
                 message: this.$t('message.request.failed'),
-                description: this.$t('message.enter.valid.nic.ip') + ': ' + nicId
+                description: this.$t('message.select.nic.network') + ': ' + nicId
               })
               return
             }
-            params['nicipaddresslist[' + nicIpIndex + '].nic'] = nicId
-            params['nicipaddresslist[' + nicIpIndex + '].ip4Address'] = this.nicsNetworksMapping[nicId].ipAddress
-            nicIpIndex++
-          }
-        }
-        this.updateLoading(true)
-        const name = params.name
-        return new Promise((resolve, reject) => {
-          postAPI(importapi, params).then(response => {
-            var jobId
-            if (this.isDiskImport || this.isExternalImport || this.selectedVmwareVcenter) {
-              jobId = response.importvmresponse.jobid
+            params['nicnetworklist[' + nicNetworkIndex + '].nic'] = nicId
+            params['nicnetworklist[' + nicNetworkIndex + '].network'] = this.nicsNetworksMapping[nicId].network
+            var netId = this.nicsNetworksMapping[nicId].network
+            if (!networkcheck.has(netId)) {
+              networkcheck.add(netId)
             } else {
-              jobId = response.importunmanagedinstanceresponse.jobid
+              this.$notification.error({
+                message: this.$t('message.request.failed'),
+                description: 'Same network cannot be assigned to multiple Nics'
+              })
+              return
             }
-            let msgLoading = this.$t('label.import.instance') + ' ' + name + ' ' + this.$t('label.in.progress')
-            if (this.selectedKvmHostForConversion) {
-              const kvmHost = this.kvmHostsForConversion.filter(x => x.id === this.selectedKvmHostForConversion)[0]
-              msgLoading += ' on host ' + kvmHost.name
+            nicNetworkIndex++
+            if ('ipAddress' in this.nicsNetworksMapping[nicId]) {
+              if (!this.nicsNetworksMapping[nicId].ipAddress) {
+                this.$notification.error({
+                  message: this.$t('message.request.failed'),
+                  description: this.$t('message.enter.valid.nic.ip') + ': ' + nicId
+                })
+                return
+              }
+              params['nicipaddresslist[' + nicIpIndex + '].nic'] = nicId
+              params['nicipaddresslist[' + nicIpIndex + '].ip4Address'] = this.nicsNetworksMapping[nicId].ipAddress
+              nicIpIndex++
             }
-            this.$pollJob({
-              jobId,
-              title: this.$t('label.import.instance'),
-              description: name,
-              loadingMessage: msgLoading,
-              catchMessage: this.$t('error.fetching.async.job.result'),
-              successMessage: this.$t('message.success.import.instance') + ' ' + name,
-              successMethod: result => {
-                this.$emit('refresh-data')
-                resolve(result)
-              },
-              errorMethod: (result) => {
+          }
+          this.updateLoading(true)
+          const name = params.name
+          return new Promise((resolve, reject) => {
+            postAPI(importapi, params)
+              .then((response) => {
+                var jobId
+                if (this.isDiskImport || this.isExternalImport || this.selectedVmwareVcenter) {
+                  jobId = response.importvmresponse.jobid
+                } else {
+                  jobId = response.importunmanagedinstanceresponse.jobid
+                }
+                let msgLoading = this.$t('label.import.instance') + ' ' + name + ' ' + this.$t('label.in.progress')
+                if (this.selectedKvmHostForConversion) {
+                  const kvmHost = this.kvmHostsForConversion.filter(
+                    (x) => x.id === this.selectedKvmHostForConversion
+                  )[0]
+                  msgLoading += ' on host ' + kvmHost.name
+                }
+                this.$pollJob({
+                  jobId,
+                  title: this.$t('label.import.instance'),
+                  description: name,
+                  loadingMessage: msgLoading,
+                  catchMessage: this.$t('error.fetching.async.job.result'),
+                  successMessage: this.$t('message.success.import.instance') + ' ' + name,
+                  successMethod: (result) => {
+                    this.$emit('refresh-data')
+                    resolve(result)
+                  },
+                  errorMethod: (result) => {
+                    this.updateLoading(false)
+                    reject(result.jobresult.errortext)
+                  }
+                })
+              })
+              .catch((error) => {
                 this.updateLoading(false)
-                reject(result.jobresult.errortext)
-              }
-            })
-          }).catch(error => {
-            this.updateLoading(false)
-            this.$notifyError(error)
-          }).finally(() => {
-            this.closeAction()
-            this.updateLoading(false)
+                this.$notifyError(error)
+              })
+              .finally(() => {
+                this.closeAction()
+                this.updateLoading(false)
+              })
           })
         })
-      }).catch(() => {
-        this.$emit('loading-changed', false)
-      })
+        .catch(() => {
+          this.$emit('loading-changed', false)
+        })
     },
     updateLoading (value) {
       this.loading = value