apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.18'

Browse Source
This commit is contained in:
nvazquez 2023-05-24 11:01:10 -03:00
commit 0024cb0372
No known key found for this signature in database
GPG Key ID: 656E1BCC8CB54F84
6 changed files with 147 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
View File

@ -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;
}

84
engine/storage/image/src/test/java/org/apache/cloudstack/storage/image/TemplateServiceImplTest.java Normal file
View File

@ -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));
}
}

33
plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/api/command/ConfigTungstenFabricServiceCmd.java
View File

@ -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<NetworkOfferingVO> 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<NetworkOfferingVO> systemNetworkOffering = networkOfferingDao.listSystemNetworkOfferings();
for (NetworkOfferingVO networkOffering : systemNetworkOffering) {

2
tools/marvin/marvin/deployDataCenter.py
View File

@ -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:

17
ui/src/components/view/InfoCard.vue
View File

@ -477,16 +477,19 @@
</span>
</div>
<div class="resource-detail-item" v-if="resource.templateid">
<div class="resource-detail-item__label">{{ resource.isoid ? $t('label.iso') : $t('label.templatename') }}</div>
<div class="resource-detail-item__label">{{ $t('label.templatename') }}</div>
<div class="resource-detail-item__details">
<resource-icon v-if="resource.icon" :image="getImage(resource.icon.base64image)" size="1x" style="margin-right: 5px"/>
<PictureOutlined v-else />
<div v-if="resource.isoid">
<SaveOutlined v-else />
<router-link :to="{ path: '/template/' + resource.templateid }">{{ resource.templatedisplaytext || resource.templatename || resource.templateid }} </router-link>
</div>
</div>
<div class="resource-detail-item" v-if="resource.isoid">
<div class="resource-detail-item__label">{{ $t('label.iso') }}</div>
<div class="resource-detail-item__details">
<resource-icon v-if="resource.icon" :image="getImage(resource.icon.base64image)" size="1x" style="margin-right: 5px"/>
<UsbOutlined v-else />
<router-link :to="{ path: '/iso/' + resource.isoid }">{{ resource.isodisplaytext || resource.isoname || resource.isoid }} </router-link>
</div>
<div v-else>
<router-link :to="{ path: '/template/' + resource.templateid }">{{ resource.templatedisplaytext || resource.templatename || resource.templateid }} </router-link>
</div>
</div>
</div>
<div class="resource-detail-item" v-if="resource.serviceofferingname && resource.serviceofferingid">

7
ui/src/views/network/IngressEgressRuleConfigure.vue
View File

@ -138,11 +138,12 @@
:closable="true"
:afterClose="closeModal"
:maskClosable="false"
class="tags-modal"
@cancel="tagsModalVisible = false">
<a-spin v-if="tagsLoading"></a-spin>
<div v-else v-ctrl-enter="handleAddTag">
<a-form :ref="formRef" :model="form" :rules="rules" class="add-tags">
<a-form :ref="formRef" :model="form" :rules="formRules" class="add-tags">
<div class="add-tags__input">
<p class="add-tags__label">{{ $t('label.key') }}</p>
<a-form-item ref="key" name="key">
@ -157,7 +158,7 @@
<a-input v-model:value="form.value" />
</a-form-item>
</div>
<a-button type="primary">{{ $t('label.add') }}</a-button>
<a-button :disabled="!('createTags' in $store.getters.apis)" type="primary" ref="submit" @click="handleAddTag">{{ $t('label.add') }}</a-button>
</a-form>
<a-divider style="margin-top: 0;" />
@ -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') }]
})