diff options
| author |   Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-11-08 05:30:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-11-08 05:30:21 +0000 |
| commit | a090f3e48d320ac7c53b963b170eeeda512673f2 (patch) | |
| tree | 0f5ad97b4c98ead69bf02a56116ca3c9445aa1a3 | |
| parent | 8d496b4f1516d25e39bbd909cb7185e74a453cc6 (diff) | |
| parent | 3fe6d74f5c957c860afd2eff5cd2fa13fe6b951f (diff) | |
Merge "create service instance with source as empty"
2 files changed, 8 insertions, 0 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java index 6413c4bf57..3c40003dd0 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/ServiceInstances.java @@ -751,6 +751,11 @@ public class ServiceInstances { private RecipeLookupResult getServiceURI (CatalogDatabase db, MsoRequest msoRequest, Action action) throws Exception { // SERVICE REQUEST // Construct the default service name + // if no source is provided then make it as VID +// if (null == msoRequest.getRequestInfo().getSource() || msoRequest.getRequestInfo().getSource().isEmpty()){ +// msoRequest.getRequestInfo().setSource("VID"); +// } + // TODO need to make this a configurable property String defaultServiceModelName = msoRequest.getRequestInfo().getSource() + "_DEFAULT"; diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java index ba017fe27d..6b8cb84b3c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RequestInfo.java @@ -143,6 +143,9 @@ public class RequestInfo { * */ public String getSource() { + if(null == source || source.isEmpty()){ + source = "VID"; + } return source; } |