diff options
Diffstat (limited to 'adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack')
2 files changed, 15 insertions, 5 deletions
diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkRollback.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkRollback.java index 11a74d4494..0125cce287 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkRollback.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/beans/NetworkRollback.java @@ -7,9 +7,9 @@ * Licensed 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. @@ -43,6 +43,7 @@ public class NetworkRollback { private String tenantId; private String cloudId; private String networkType; + private String modelCustomizationUuid; private boolean networkCreated = false; // Previous values for updates private String networkName = null; @@ -63,7 +64,7 @@ public class NetworkRollback { public void setNeutronNetworkId(String neutronNetworkId) { this.neutronNetworkId = neutronNetworkId; } - + public String getNetworkStackId() { return networkStackId; } @@ -91,6 +92,14 @@ public class NetworkRollback { this.networkType = networkType; } + public String getModelCustomizationUuid() { + return this.modelCustomizationUuid; + } + + public void setModelCustomizationUuid(String modelCustomizationUuid) { + this.modelCustomizationUuid = modelCustomizationUuid; + } + public boolean getNetworkCreated() { return networkCreated; } @@ -125,7 +134,7 @@ public class NetworkRollback { public void setMsoRequest (MsoRequest msoRequest) { this.msoRequest = msoRequest; } - + @Override public String toString() { return "NetworkRollback [networkId=" + networkId @@ -135,5 +144,5 @@ public class NetworkRollback { + ", networkCreated=" + networkCreated + ", networkName=" + networkName + ", physicalNetwork=" + physicalNetwork + "]"; } - + } diff --git a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java index 99d5863819..1c91fe2430 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java +++ b/adapters/mso-adapter-utils/src/main/java/org/openecomp/mso/openstack/utils/MsoHeatUtils.java @@ -984,6 +984,7 @@ public class MsoHeatUtils extends MsoCommonUtils { String heatUrl = null; try { heatUrl = KeystoneUtils.findEndpointURL (access.getServiceCatalog (), "orchestration", region, "public"); + LOGGER.debug("heatUrl=" + heatUrl + ", region=" + region); } catch (RuntimeException e) { // This comes back for not found (probably an incorrect region ID) String error = "Orchestration service not found: region=" + region + ",cloud=" + cloudIdentity.getId (); |