From a9b2b1d16797fefa4c7be8ba0bf01f0fdab22b7b Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 15 Aug 2018 16:34:02 -0400 Subject: add prov-status check to AAI queries Also had to add prov-status field to AaiGetVnfResponse class. Removed bogus comment from test. Verify response is not null in test. Verify no requery by vnf name in test. Add prov-status to template.demo tests. Add prov-status to sample json for archetype-cl's. Change-Id: I3f36a2bb6de8265ce5b10103690d6d8813c15b1a Issue-ID: POLICY-964 Signed-off-by: Jim Hahn --- .../archetype-resources/src/main/config/dcae.vcpe.abatement.json | 1 + .../resources/archetype-resources/src/main/config/dcae.vcpe.onset.json | 1 + .../resources/archetype-resources/src/main/config/dcae.vdns.onset.json | 1 + .../resources/archetype-resources/src/main/config/dcae.vfw.onset.json | 1 + .../resources/archetype-resources/src/main/config/dcae.volte.onset.json | 1 + 5 files changed, 5 insertions(+) (limited to 'controlloop/templates/archetype-cl-casablanca/src/main') diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json index 3d6dc4ae1..d4cbc0e89 100644 --- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.abatement.json @@ -9,6 +9,7 @@ "target": "generic-vnf.vnf-id", "AAI": { "generic-vnf.is-closed-loop-disabled": "false", + "generic-vnf.prov-status": "ACTIVE", "generic-vnf.vnf-id": "vCPE_Infrastructure_vGMUX_demo_app" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json index 98403b034..df7ae6166 100644 --- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vcpe.onset.json @@ -8,6 +8,7 @@ "target": "generic-vnf.vnf-id", "AAI": { "generic-vnf.is-closed-loop-disabled": "false", + "generic-vnf.prov-status": "ACTIVE", "generic-vnf.vnf-id": "vCPE_Infrastructure_vGMUX_demo_app" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json index 80730e9e3..1465893d9 100644 --- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vdns.onset.json @@ -8,6 +8,7 @@ "target": "vserver.vserver-name", "AAI": { "vserver.is-closed-loop-disabled": "false", + "generic-vnf.prov-status": "ACTIVE", "vserver.vserver-name": "dfw1lb01lb01" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json index 0aa0effa6..b135e9193 100644 --- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.vfw.onset.json @@ -8,6 +8,7 @@ "target": "generic-vnf.vnf-id", "AAI": { "generic-vnf.is-closed-loop-disabled": "false", + "generic-vnf.prov-status": "ACTIVE", "generic-vnf.vnf-id": "fw0002vm002fw002" }, "from": "DCAE", diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json index 2cf28fb3f..f17a1ea0f 100644 --- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/src/main/config/dcae.volte.onset.json @@ -8,6 +8,7 @@ "target": "vserver.vserver-name", "AAI": { "vserver.is-closed-loop-disabled": "false", + "vserver-vnf.prov-status": "ACTIVE", "vserver.vserver-name": "dfw1lb01lb01", "service-instance.service-instance-id" : "vserver-name-16102016-aai3255-data-11-1", "generic-vnf.vnf-id" : "vnf-id-16102016-aai3255-data-11-1", -- cgit 1.2.3-korg