diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-07-28 11:29:23 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-08-02 15:43:44 +0000 |
| commit | 38713207b817ed4700f630748c681116338d32f0 (patch) | |
| tree | 9eb2097cee8d85ac14f17e3a280ae8aefb69d9de /appc-dg/appc-dg-shared/appc-dg-aai/src | |
| parent | 771ac55e29d099d8bbf783612de975047d75ab12 (diff) | |
Merging in bug fixes
Change-Id: I85da90b9ba0d03149f42035a820c76ef0285e413
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue: APPC-100
Diffstat (limited to 'appc-dg/appc-dg-shared/appc-dg-aai/src')
2 files changed, 7 insertions, 2 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java index 308261cfc..93ad6a5e7 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/AAIPluginImpl.java @@ -147,7 +147,7 @@ public class AAIPluginImpl implements AAIPlugin { vnfQueryResult = readVnf(vnfId); vnfType = vnfQueryResult.getAdditionProperties().get("vnf-type"); - vnfVersion = vnfQueryResult.getAdditionProperties().get("persona-model-version"); + vnfVersion = vnfQueryResult.getAdditionProperties().get(Constants.AAI_VNF_MODEL_VERSION_ID); for(Relationship vnfRelationship:vnfQueryResult.getRelationshipList()){ if("vserver".equalsIgnoreCase(vnfRelationship.getRelatedTo())){ @@ -258,7 +258,7 @@ public class AAIPluginImpl implements AAIPlugin { String[] additionalProperties = new String[]{"vnf-type","vnf-name", "in-maint","prov-status","heat-stack-id", - "is-closed-loop-disabled","orchestration-status","resource-version","persona-model-version"}; + "is-closed-loop-disabled","orchestration-status","resource-version",Constants.AAI_VNF_MODEL_VERSION_ID}; AAIQueryResult result = readRelationDataAndProperties(prefix, vnfContext,additionalProperties); diff --git a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java index 0a9fe2176..1ccd6c47d 100644 --- a/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java +++ b/appc-dg/appc-dg-shared/appc-dg-aai/src/main/java/org/openecomp/appc/dg/aai/impl/Constants.java @@ -93,6 +93,11 @@ public class Constants { public static final String IS_ACQUIRE_ENTITLEMENT_REQUIRE ="is.acquire-entitlement.require"; public static final String IS_RELEASE_ENTITLEMENT_REQUIRE ="is.release-entitlement.require"; + /** + * AAI property names + */ + public static final String AAI_VNF_MODEL_VERSION_ID ="model-version-id"; + public enum ASDC_ARTIFACTS_FIELDS { SERVICE_UUID, DISTRIBUTION_ID, |