summaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
authorByung-Woo Jun <byung-woo.jun@est.tech>2020-10-13 12:32:45 +0000
committerGerrit Code Review <gerrit@onap.org>2020-10-13 12:32:45 +0000
commit3d2ae5b02773deaa459b08d629cb0446a1fe61ae (patch)
tree3554c686c17ba9b8416c0fb4c7059a18b21aa808 /adapters
parent609ec36ccf6ba2498ab8e6140e22d6fbcd6e5174 (diff)
parentf76600a5346c99a2cc906d7c13d73c2c033ec154 (diff)
Merge "Updating code to use pkgId from request if set"
Diffstat (limited to 'adapters')
-rw-r--r--adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java
index a2af1a4580..4a8e95ff07 100644
--- a/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java
+++ b/adapters/etsi-sol003-adapter/etsi-sol003-lcm/etsi-sol003-lcm-adapter/src/main/java/org/onap/so/adapters/etsisol003adapter/lcm/lifecycle/LifecycleManager.java
@@ -199,9 +199,9 @@ public class LifecycleManager {
private String sendInstantiateRequestToVnfm(final EsrVnfm vnfm, final GenericVnf genericVnf,
final CreateVnfRequest createVnfRequest) {
- final InstantiateVnfRequest instantiateVnfRequest =
- vnfmHelper.createInstantiateRequest(createVnfRequest.getTenant(), createVnfRequest,
- packageProvider.getFlavourId(genericVnf.getModelVersionId()));
+ final String pkgId = getPackageId(createVnfRequest, genericVnf);
+ final InstantiateVnfRequest instantiateVnfRequest = vnfmHelper.createInstantiateRequest(
+ createVnfRequest.getTenant(), createVnfRequest, packageProvider.getFlavourId(pkgId));
final String jobId = vnfmServiceProvider.instantiateVnf(vnfm, genericVnf.getSelflink(), instantiateVnfRequest);
logger.info("Instantiate VNF request successfully sent to " + genericVnf.getSelflink());