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

Fix Tungsten Fabric errors on adding a new zone due to duplicated entries on ntwk_service_map (#7455)

Browse Source 
* Fix Tungsten Fabric errors on adding a new zone due to duplicated entries on ntwk_service_map

* Address review comments
This commit is contained in:
Nicolas Vazquez 2023-05-24 11:00:29 -03:00 committed by GitHub
parent 22871ad2da
commit 5e71cea2c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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); Network managementNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Management);
NetworkServiceMapVO managementNetworkServiceMapVO = new NetworkServiceMapVO(managementNetwork.getId(), NetworkServiceMapVO managementNetworkServiceMapVO = new NetworkServiceMapVO(managementNetwork.getId(),
Network.Service.Connectivity, Network.Provider.Tungsten); 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(); List<NetworkOfferingVO> systemNetworkOffering = networkOfferingDao.listSystemNetworkOfferings();
for (NetworkOfferingVO networkOffering : systemNetworkOffering) { for (NetworkOfferingVO networkOffering : systemNetworkOffering) {
@ -132,6 +135,30 @@ public class ConfigTungstenFabricServiceCmd extends BaseCmd {
private void persistDefaultSystemNetwork() { private void persistDefaultSystemNetwork() {
Transaction.execute(new TransactionCallbackNoReturn() { 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 @Override
public void doInTransactionWithoutResult(final TransactionStatus status) { public void doInTransactionWithoutResult(final TransactionStatus status) {
NetworkOfferingVO networkOfferingVO = networkOfferingDao.findByUniqueName(NETWORKOFFERING); NetworkOfferingVO networkOfferingVO = networkOfferingDao.findByUniqueName(NETWORKOFFERING);
@ -169,12 +196,12 @@ public class ConfigTungstenFabricServiceCmd extends BaseCmd {
Network publicNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Public); Network publicNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Public);
NetworkServiceMapVO publicNetworkServiceMapVO = new NetworkServiceMapVO(publicNetwork.getId(), NetworkServiceMapVO publicNetworkServiceMapVO = new NetworkServiceMapVO(publicNetwork.getId(),
Network.Service.Connectivity, Network.Provider.Tungsten); Network.Service.Connectivity, Network.Provider.Tungsten);
networkServiceMapDao.persist(publicNetworkServiceMapVO); persistNetworkServiceMapAvoidingDuplicates(publicNetwork, publicNetworkServiceMapVO);
Network managementNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Management); Network managementNetwork = networkModel.getSystemNetworkByZoneAndTrafficType(zoneId, Networks.TrafficType.Management);
NetworkServiceMapVO managementNetworkServiceMapVO = new NetworkServiceMapVO(managementNetwork.getId(), NetworkServiceMapVO managementNetworkServiceMapVO = new NetworkServiceMapVO(managementNetwork.getId(),
Network.Service.Connectivity, Network.Provider.Tungsten); Network.Service.Connectivity, Network.Provider.Tungsten);
networkServiceMapDao.persist(managementNetworkServiceMapVO); persistNetworkServiceMapAvoidingDuplicates(managementNetwork, managementNetworkServiceMapVO);
List<NetworkOfferingVO> systemNetworkOffering = networkOfferingDao.listSystemNetworkOfferings(); List<NetworkOfferingVO> systemNetworkOffering = networkOfferingDao.listSystemNetworkOfferings();
for (NetworkOfferingVO networkOffering : systemNetworkOffering) { for (NetworkOfferingVO networkOffering : systemNetworkOffering) {