diff options
| author |   Rob Daugherty <rd472p@att.com> | 2018-11-14 15:02:31 -0500 |
|---|---|---|
| committer | Rob Daugherty <rd472p@att.com> | 2018-11-15 00:21:08 +0000 |
| commit | d45c2eed969fb9273e67dd6a3a58b83499b05bf8 (patch) | |
| tree | 578bbb5c2926e6093f631a7bae7cef650ca104ff | |
| parent | 827edc452055afa431080d04c5668db5e16964fd (diff) | |
vCPE BRG allottedResourceRole is null
In Beijing we used:
o.getNfRole()
In Casablanca, it was:
o.getTargetNetworkRole()
I'm changing it to:
o.getTargetNetworkRole() != null ? o.getTargetNetworkRole() : o.getNfRole()
Change-Id: I874b2f01fd651bb38a361fa9c36f9937b1f02b2f
Issue-ID: SO-1200
Signed-off-by: Rob Daugherty <rd472p@att.com>
| -rw-r--r-- | adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java index 3dca6a395c..7a215a9458 100644 --- a/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java +++ b/adapters/mso-catalog-db-adapter/src/main/java/org/onap/so/adapters/catalogdb/catalogrest/QueryAllottedResourceCustomization.java @@ -117,7 +117,7 @@ public class QueryAllottedResourceCustomization extends CatalogQuery { put(valueMap, "MODEL_INSTANCE_NAME", o.getModelInstanceName()); put(valueMap, "TOSCA_NODE_TYPE", arNull ? null : o.getAllottedResource().getToscaNodeType()); put(valueMap, "ALLOTTED_RESOURCE_TYPE", arNull ? null : o.getAllottedResource().getSubcategory()); - put(valueMap, "ALLOTTED_RESOURCE_ROLE", o.getTargetNetworkRole()); + put(valueMap, "ALLOTTED_RESOURCE_ROLE", o.getTargetNetworkRole() != null ? o.getTargetNetworkRole() : o.getNfRole()); put(valueMap, "NF_TYPE", o.getNfType()); put(valueMap, "NF_ROLE", o.getNfRole()); put(valueMap, "NF_FUNCTION", o.getNfFunction()); |