aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-05-07 09:23:55 -0400
committerRob Daugherty <rd472p@att.com>2018-05-07 09:25:44 -0400
commitf2d0a4f94fb3d4ea44d2019271c28db6cdacfb79 (patch)
treee640452f890871d280d4d99c3900cfa525a55ad3
parente4f5b019644bcced35371a95f726a2020857af5a (diff)
vnf-adapter failed to deploy
This is related to recent CloudConfig fixes. One change was apparently not submitted in the last batch. Change-Id: I8dcc49f7d808e0d842af3f568f5815fb48870acc Issue-ID: SO-584 Signed-off-by: Rob Daugherty <rd472p@att.com>
-rw-r--r--adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java
index 0b9ffd9468..4e0d51432e 100644
--- a/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java
+++ b/adapters/mso-vnf-adapter/src/main/java/org/openecomp/mso/adapters/vnf/MsoVnfPluginAdapterImpl.java
@@ -58,7 +58,6 @@ import org.openecomp.mso.adapters.vdu.VduStatus;
import org.openecomp.mso.adapters.vdu.mapper.VfModuleCustomizationToVduMapper;
import org.openecomp.mso.adapters.vnf.exceptions.VnfAlreadyExists;
import org.openecomp.mso.adapters.vnf.exceptions.VnfException;
-import org.openecomp.mso.cloud.CloudConfig;
import org.openecomp.mso.cloud.CloudConfigFactory;
import org.openecomp.mso.cloud.CloudSite;
import org.openecomp.mso.cloudify.utils.MsoCloudifyUtils;
@@ -92,7 +91,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
public class MsoVnfPluginAdapterImpl implements MsoVnfAdapter {
CloudConfigFactory cloudConfigFactory = new CloudConfigFactory();
- protected CloudConfig cloudConfig = cloudConfigFactory.getCloudConfig();
protected MsoHeatUtils heatUtils;
protected VfModuleCustomizationToVduMapper vduMapper;
protected MsoCloudifyUtils cloudifyUtils;
@@ -694,7 +692,7 @@ public class MsoVnfPluginAdapterImpl implements MsoVnfAdapter {
// Perform a version check against cloudSite
// Obtain the cloud site information where we will create the VF Module
- Optional<CloudSite> cloudSite = cloudConfig.getCloudSite (cloudSiteId);
+ Optional<CloudSite> cloudSite = cloudConfigFactory.getCloudConfig().getCloudSite (cloudSiteId);
if (!cloudSite.isPresent()) {
throw new VnfException (new MsoCloudSiteNotFound (cloudSiteId));
}
@@ -1223,7 +1221,7 @@ public class MsoVnfPluginAdapterImpl implements MsoVnfAdapter {
* but we don't currently have access to that in Query and Delete cases.
*/
private VduPlugin getVduPlugin (String cloudSiteId) {
- Optional<CloudSite> cloudSite = cloudConfig.getCloudSite(cloudSiteId);
+ Optional<CloudSite> cloudSite = cloudConfigFactory.getCloudConfig().getCloudSite(cloudSiteId);
if (cloudSite.isPresent()) {
String orchestrator = cloudSite.get().getOrchestrator();