diff --git a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java index 6baccb3526a..e6235a63c77 100644 --- a/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java +++ b/engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java @@ -286,6 +286,23 @@ public class TemplateServiceImpl implements TemplateService { } } + protected boolean isSkipTemplateStoreDownload(VMTemplateVO template, Long zoneId) { + if (template.isPublicTemplate()) { + return false; + } + if (template.isFeatured()) { + return false; + } + if (TemplateType.SYSTEM.equals(template.getTemplateType())) { + return false; + } + if (zoneId != null && _vmTemplateStoreDao.findByTemplateZone(template.getId(), zoneId, DataStoreRole.Image) == null) { + s_logger.debug(String.format("Template %s is not present on any image store for the zone ID: %d, its download cannot be skipped", template.getUniqueName(), zoneId)); + return false; + } + return true; + } + @Override public void handleTemplateSync(DataStore store) { if (store == null) { @@ -513,7 +530,7 @@ public class TemplateServiceImpl implements TemplateService { continue; } // if this is private template, skip sync to a new image store - if (!tmplt.isPublicTemplate() && !tmplt.isFeatured() && tmplt.getTemplateType() != TemplateType.SYSTEM) { + if (isSkipTemplateStoreDownload(tmplt, zoneId)) { s_logger.info("Skip sync downloading private template " + tmplt.getUniqueName() + " to a new image store"); continue; } diff --git a/engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java b/engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java new file mode 100644 index 00000000000..e2b07c5bbb6 --- /dev/null +++ b/engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java @@ -0,0 +1,84 @@ +/* + * 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. + */ +package org.apache.cloudstack.storage.image; + +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO; +import org.junit.Assert; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnitRunner; + +import com.cloud.storage.DataStoreRole; +import com.cloud.storage.Storage; +import com.cloud.storage.VMTemplateVO; + +@RunWith(MockitoJUnitRunner.class) +public class TemplateServiceImplTest { + + @InjectMocks + @Spy + TemplateServiceImpl templateService; + + @Mock + TemplateDataStoreDao templateDataStoreDao; + + @Test + public void testIsSkipTemplateStoreDownloadPublicTemplate() { + VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class); + Mockito.when(templateVO.isPublicTemplate()).thenReturn(true); + Assert.assertFalse(templateService.isSkipTemplateStoreDownload(templateVO, 1L)); + } + + @Test + public void testIsSkipTemplateStoreDownloadFeaturedTemplate() { + VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class); + Mockito.when(templateVO.isFeatured()).thenReturn(true); + Assert.assertFalse(templateService.isSkipTemplateStoreDownload(templateVO, 1L)); + } + + @Test + public void testIsSkipTemplateStoreDownloadSystemTemplate() { + VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class); + Mockito.when(templateVO.getTemplateType()).thenReturn(Storage.TemplateType.SYSTEM); + Assert.assertFalse(templateService.isSkipTemplateStoreDownload(templateVO, 1L)); + } + + @Test + public void testIsSkipTemplateStoreDownloadPrivateNoRefTemplate() { + VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class); + long id = 1L; + Mockito.when(templateVO.getId()).thenReturn(id); + Mockito.when(templateDataStoreDao.findByTemplateZone(id, id, DataStoreRole.Image)).thenReturn(null); + Assert.assertFalse(templateService.isSkipTemplateStoreDownload(templateVO, id)); + } + + @Test + public void testIsSkipTemplateStoreDownloadPrivateExistingTemplate() { + VMTemplateVO templateVO = Mockito.mock(VMTemplateVO.class); + long id = 1L; + Mockito.when(templateVO.getId()).thenReturn(id); + Mockito.when(templateDataStoreDao.findByTemplateZone(id, id, DataStoreRole.Image)).thenReturn(Mockito.mock(TemplateDataStoreVO.class)); + Assert.assertTrue(templateService.isSkipTemplateStoreDownload(templateVO, id)); + } +} \ No newline at end of file diff --git a/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java b/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java index 1085804fd31..8544ec9bf97 100644 --- a/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java +++ b/plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java @@ -107,7 +107,10 @@ public class ConfigTungstenFabricServiceCmd extends BaseCmd { Network managementNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Management); NetworkServiceMapVO managementNetworkServiceMapVO = new NetworkServiceMapVO(managementNetwork.getId(), Network.Service.Connectivity, Network.Provider.Tungsten); - networkServiceMapDao.persist(managementNetworkServiceMapVO); + if (!networkServiceMapDao.canProviderSupportServiceInNetwork(managementNetwork.getId(), + Network.Service.Connectivity, Network.Provider.Tungsten)) { + networkServiceMapDao.persist(managementNetworkServiceMapVO); + } List systemNetworkOffering = networkOfferingDao.listSystemNetworkOfferings(); for (NetworkOfferingVO networkOffering : systemNetworkOffering) { @@ -132,6 +135,30 @@ public class ConfigTungstenFabricServiceCmd extends BaseCmd { private void persistDefaultSystemNetwork() { Transaction.execute(new TransactionCallbackNoReturn() { + + private void persistNetworkServiceMapAvoidingDuplicates(Network network, + NetworkServiceMapVO mapVO) { + if (mapVO == null) { + s_logger.error("Expected a network-service-provider mapping entity to be persisted"); + return; + } + Network.Service service = Network.Service.getService(mapVO.getService()); + Network.Provider provider = Network.Provider.getProvider(mapVO.getProvider()); + if (service == null || provider == null) { + s_logger.error(String.format("Could not obtain the service or the provider " + + "from the network-service-provider map with ID = %s", mapVO.getId())); + return; + } + if (networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), service, provider)) { + s_logger.debug(String.format("A mapping between the network, service and provider (%s, %s, %s) " + + "already exists, skipping duplicated entry", + network.getId(), service.getName(), provider.getName())); + return; + + } + networkServiceMapDao.persist(mapVO); + } + @Override public void doInTransactionWithoutResult(final TransactionStatus status) { NetworkOfferingVO networkOfferingVO = networkOfferingDao.findByUniqueName(NETWORKOFFERING); @@ -169,12 +196,12 @@ public class ConfigTungstenFabricServiceCmd extends BaseCmd { Network publicNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Public); NetworkServiceMapVO publicNetworkServiceMapVO = new NetworkServiceMapVO(publicNetwork.getId(), Network.Service.Connectivity, Network.Provider.Tungsten); - networkServiceMapDao.persist(publicNetworkServiceMapVO); + persistNetworkServiceMapAvoidingDuplicates(publicNetwork, publicNetworkServiceMapVO); Network managementNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Management); NetworkServiceMapVO managementNetworkServiceMapVO = new NetworkServiceMapVO(managementNetwork.getId(), Network.Service.Connectivity, Network.Provider.Tungsten); - networkServiceMapDao.persist(managementNetworkServiceMapVO); + persistNetworkServiceMapAvoidingDuplicates(managementNetwork, managementNetworkServiceMapVO); List systemNetworkOffering = networkOfferingDao.listSystemNetworkOfferings(); for (NetworkOfferingVO networkOffering : systemNetworkOffering) { diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index 95417ae507f..4e23a6a5d45 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -1133,7 +1133,7 @@ class DeleteDataCenters: print("\n====DeployDC: CleanUp Started====") ret = FAILED if self.__dcCfgFile: - file_to_read = open(self.__dcCfgFile, 'r') + file_to_read = open(self.__dcCfgFile, 'rb') if file_to_read: self.__dcCfg = pickle.load(file_to_read) if self.__dcCfg: diff --git a/ui/src/components/view/InfoCard.vue b/ui/src/components/view/InfoCard.vue index f28f19c7d0e..9a7c1f14b10 100644 --- a/ui/src/components/view/InfoCard.vue +++ b/ui/src/components/view/InfoCard.vue @@ -477,16 +477,19 @@
-
{{ resource.isoid ? $t('label.iso') : $t('label.templatename') }}
+
{{ $t('label.templatename') }}
- -
+ + {{ resource.templatedisplaytext || resource.templatename || resource.templateid }} +
+
+
+
{{ $t('label.iso') }}
+
+ + {{ resource.isodisplaytext || resource.isoname || resource.isoid }} -
-
- {{ resource.templatedisplaytext || resource.templatename || resource.templateid }} -
diff --git a/ui/src/views/network/IngressEgressRuleConfigure.vue b/ui/src/views/network/IngressEgressRuleConfigure.vue index 44b6d5e5a03..adf013cb9aa 100644 --- a/ui/src/views/network/IngressEgressRuleConfigure.vue +++ b/ui/src/views/network/IngressEgressRuleConfigure.vue @@ -138,11 +138,12 @@ :closable="true" :afterClose="closeModal" :maskClosable="false" + class="tags-modal" @cancel="tagsModalVisible = false">
- +

{{ $t('label.key') }}

@@ -157,7 +158,7 @@
- {{ $t('label.add') }} + {{ $t('label.add') }} @@ -280,7 +281,7 @@ export default { initForm () { this.formRef = ref() this.form = reactive({}) - this.rules = reactive({ + this.formRules = reactive({ key: [{ required: true, message: this.$t('message.specify.tag.key') }], value: [{ required: true, message: this.$t('message.specify.tag.value') }] })