aboutsummaryrefslogtreecommitdiffstats
path: root/adapters/mso-openstack-adapters/src
diff options
context:
space:
mode:
authorMunir Ahmad <munir.ahmad@bell.ca>2019-03-26 10:28:54 -0400
committerMunir Ahmad <munir.ahmad@bell.ca>2019-03-26 14:38:41 +0000
commitcfc556e3dcfc2cd729dce4d596bbe03b07b3e405 (patch)
tree2ddb3e3fb44f0b42b17a313649cdea0689faca71 /adapters/mso-openstack-adapters/src
parentaf46c0d4b30ecb5c8f36992e74adb86d7d5bbe06 (diff)
Remove hardcoded CloudOwner from heatbridge
Change-Id: I87c42b76c226f717770fb072f391e0e7244bbff6 Issue-ID: SO-1484 Signed-off-by: Munir Ahmad <munir.ahmad@bell.ca>
Diffstat (limited to 'adapters/mso-openstack-adapters/src')
-rw-r--r--adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
index 949027f7c1..7fc0db7869 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/adapters/vnf/MsoVnfAdapterImpl.java
@@ -520,7 +520,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
}
}
- private void heatbridge(StackInfo heatStack, String cloudSiteId, String tenantId, String genericVnfName,
+ private void heatbridge(StackInfo heatStack, String cloudOwner, String cloudSiteId, String tenantId, String genericVnfName,
String vfModuleId) {
try {
CloudSite cloudSite = cloudConfig.getCloudSite(cloudSiteId).orElseThrow(
@@ -528,7 +528,6 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
CloudIdentity cloudIdentity = cloudSite.getIdentityService();
String heatStackId = heatStack.getCanonicalName().split("/")[1];
- String cloudOwner = "CloudOwner";//cloud owner needs to come from bpmn-adapter
List<String> oobMgtNetNames = new ArrayList<>();
HeatBridgeApi heatBridgeClient = new HeatBridgeImpl(new AAIResourcesClient(), cloudIdentity,
@@ -1345,7 +1344,7 @@ public class MsoVnfAdapterImpl implements MsoVnfAdapter {
}
logger.debug ("VF Module {} successfully created", vfModuleName);
//call heatbridge
- heatbridge(heatStack, cloudSiteId, tenantId, genericVnfName, vfModuleId);
+ heatbridge(heatStack, cloudOwner, cloudSiteId, tenantId, genericVnfName, vfModuleId);
return;
} catch (Exception e) {
logger.debug("unhandled exception in create VF",e);