summaryrefslogtreecommitdiffstats
path: root/examples/examples-onap-vcpe
diff options
context:
space:
mode:
Diffstat (limited to 'examples/examples-onap-vcpe')
-rw-r--r--examples/examples-onap-vcpe/pom.xml10
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json42
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json38
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json40
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json38
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json44
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json5
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json5
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json5
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json4
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js51
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js69
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js85
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js31
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js54
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex88
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc12
-rw-r--r--examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java17
-rw-r--r--examples/examples-onap-vcpe/src/test/resources/aai/NodeQueryResponse.json352
19 files changed, 375 insertions, 615 deletions
diff --git a/examples/examples-onap-vcpe/pom.xml b/examples/examples-onap-vcpe/pom.xml
index 16bae184e..9f6c285c4 100644
--- a/examples/examples-onap-vcpe/pom.xml
+++ b/examples/examples-onap-vcpe/pom.xml
@@ -93,11 +93,11 @@
<build>
<plugins>
- <!-- Generate the APEX Policy JSON from the APEX CLI command -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<executions>
+ <!-- Generate the APEX Policy JSON from the APEX CLI command -->
<execution>
<id>generate-policy</id>
<phase>compile</phase>
@@ -115,13 +115,7 @@
</arguments>
</configuration>
</execution>
- </executions>
- </plugin>
- <!-- Generate the APEX ToscaPolicy JSON file-->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <executions>
+ <!-- Generate the APEX ToscaPolicy JSON file-->
<execution>
<id>generate-tosca-policy</id>
<phase>compile</phase>
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
index ce97eeb09..5208767b0 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
@@ -52,28 +52,6 @@
"requestorPeer": "GuardRequestorProducer",
"requestorTimeout": 500
},
- "AAIRequestorConsumer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
- "parameters": {
- "url": "http://10.0.1.1:8443/aai/search/named-query",
- "httpMethod": "POST",
- "restRequestTimeout": 2000
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryResponse"
- }
- },
- "eventName": "AAINamedQueryResponseEvent",
- "eventNameFilter": "AAINamedQueryResponseEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorProducer",
- "requestorTimeout": 500
- },
"DCAEConsumer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
@@ -88,10 +66,10 @@
"nameAlias": "closedLoopControlName",
"versionAlias": "version",
"sourceAlias": "from",
- "pojoField": "VirtualControlLoopEvent"
+ "pojoField": "VirtualControlLoopEvent"
}
},
- "eventName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
+ "eventName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
},
"APPCConsumer": {
"carrierTechnologyParameters": {
@@ -137,22 +115,6 @@
"requestorPeer": "GuardRequestorConsumer",
"requestorTimeout": 500
},
- "AAIRequestorProducer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryRequest"
- }
- },
- "eventNameFilter": "AAINamedQueryRequestEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorConsumer",
- "requestorTimeout": 500
- },
"APPCProducer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json
index aa37f7ab2..cbd4d99a6 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json
@@ -68,28 +68,6 @@
"requestorPeer": "GuardRequestorProducer",
"requestorTimeout": 500
},
- "AAIRequestorConsumer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
- "parameters": {
- "url": "http://172.16.5.238:54321/OnapVCpeSim/sim/aai/search/named-query",
- "httpMethod": "POST",
- "restRequestTimeout": 2000
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryResponse"
- }
- },
- "eventName": "AAINamedQueryResponseEvent",
- "eventNameFilter": "AAINamedQueryResponseEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorProducer",
- "requestorTimeout": 500
- },
"DCAEConsumer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
@@ -151,22 +129,6 @@
"requestorPeer": "GuardRequestorConsumer",
"requestorTimeout": 500
},
- "AAIRequestorProducer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryRequest"
- }
- },
- "eventNameFilter": "AAINamedQueryRequestEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorConsumer",
- "requestorTimeout": 500
- },
"APPCProducer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json
index 46c03af05..80672ed01 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json
@@ -3,7 +3,7 @@
"name": "MyApexEngine",
"version": "0.0.1",
"id": 45,
- "instanceCount": 4,
+ "instanceCount": 1,
"deploymentPort": 12561,
"policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json",
"engineParameters": {
@@ -68,28 +68,6 @@
"requestorPeer": "GuardRequestorProducer",
"requestorTimeout": 500
},
- "AAIRequestorConsumer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
- "parameters": {
- "url": "http://localhost:54321/OnapVCpeSim/sim/aai/search/named-query",
- "httpMethod": "POST",
- "restRequestTimeout": 2000
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryResponse"
- }
- },
- "eventName": "AAINamedQueryResponseEvent",
- "eventNameFilter": "AAINamedQueryResponseEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorProducer",
- "requestorTimeout": 500
- },
"DCAEConsumer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
@@ -151,22 +129,6 @@
"requestorPeer": "GuardRequestorConsumer",
"requestorTimeout": 500
},
- "AAIRequestorProducer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryRequest"
- }
- },
- "eventNameFilter": "AAINamedQueryRequestEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorConsumer",
- "requestorTimeout": 500
- },
"APPCProducer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json
index 052568111..806cf2d11 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json
@@ -68,28 +68,6 @@
"requestorPeer": "GuardRequestorProducer",
"requestorTimeout": 500
},
- "AAIRequestorConsumer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
- "parameters": {
- "url": "http://localhost:54321/OnapVCpeSim/sim/aai/search/named-query",
- "httpMethod": "POST",
- "restRequestTimeout": 2000
- }
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryResponse"
- }
- },
- "eventName": "AAINamedQueryResponseEvent",
- "eventNameFilter": "AAINamedQueryResponseEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorProducer",
- "requestorTimeout": 500
- },
"DCAEConsumer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
@@ -151,22 +129,6 @@
"requestorPeer": "GuardRequestorConsumer",
"requestorTimeout": 500
},
- "AAIRequestorProducer": {
- "carrierTechnologyParameters": {
- "carrierTechnology": "RESTREQUESTOR",
- "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
- },
- "eventProtocolParameters": {
- "eventProtocol": "JSON",
- "parameters": {
- "pojoField": "AAINamedQueryRequest"
- }
- },
- "eventNameFilter": "AAINamedQueryRequestEvent",
- "requestorMode": true,
- "requestorPeer": "AAIRequestorConsumer",
- "requestorTimeout": 500
- },
"APPCProducer": {
"carrierTechnologyParameters": {
"carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json
index 09ace1ed6..430d50530 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json
@@ -15,7 +15,10 @@
"generic-vnf.vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
"generic-vnf.in-maint": "false",
"generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0000"
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000000",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_0"
},
"from": "DCAE",
"version": "1.0.2"
@@ -37,7 +40,10 @@
"generic-vnf.vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
"generic-vnf.in-maint": "false",
"generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0001"
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000001",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_1"
},
"from": "DCAE",
"version": "1.0.2"
@@ -52,7 +58,10 @@
"target": "generic-vnf.vnf-id",
"AAI": {
"vserver.is-closed-loop-disabled": "false",
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0002"
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000002",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_2"
},
"from": "DCAE",
"version": "1.0.2"
@@ -67,7 +76,10 @@
"target": "generic-vnf.vnf-id",
"AAI": {
"vserver.is-closed-loop-disabled": "false",
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0003"
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000003",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_3"
},
"from": "DCAE",
"version": "1.0.2"
@@ -84,7 +96,7 @@
"version": "1.0.2",
"from": "DCAE",
"AAI": {
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000004",
"generic-vnf.resource-version": "1",
"generic-vnf.vnf-name": "vCPEInfraVNF0005",
"generic-vnf.prov-status": "PREPROV",
@@ -92,7 +104,10 @@
"generic-vnf.orchestration-status": "Created",
"generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0",
"generic-vnf.in-maint": "false",
- "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0005"
+ "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0005",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_4"
}
}
{
@@ -107,7 +122,7 @@
"version": "1.0.2",
"from": "DCAE",
"AAI": {
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000005",
"generic-vnf.resource-version": "1",
"generic-vnf.vnf-name": "vCPEInfraVNF0006",
"generic-vnf.prov-status": "PREPROV",
@@ -115,7 +130,10 @@
"generic-vnf.orchestration-status": "Created",
"generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0",
"generic-vnf.in-maint": "false",
- "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0006"
+ "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0006",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_5"
}
}
{
@@ -130,7 +148,10 @@
"version": "1.0.2",
"from": "DCAE",
"AAI": {
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0006"
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000006",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_6"
}
}
{
@@ -145,6 +166,9 @@
"version": "1.0.2",
"from": "DCAE",
"AAI": {
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0007"
+ "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000007",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_7"
}
}
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json
index 5efbfef69..c97224cd2 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json
@@ -18,6 +18,9 @@
"generic-vnf.orchestration-status": "Created",
"generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0",
"generic-vnf.in-maint": "false",
- "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f"
+ "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "vserverName"
}
} \ No newline at end of file
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json
index 7cc910e96..148e415f5 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json
@@ -10,6 +10,9 @@
"version": "1.0.2",
"from": "DCAE",
"AAI": {
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1"
+ "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "vserverName"
}
} \ No newline at end of file
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json
index 49ba03d2c..dd31327e7 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json
@@ -15,7 +15,10 @@
"generic-vnf.vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
"generic-vnf.in-maint": "false",
"generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1"
+ "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+ "vserver.is-closed-loop-disabled": "false",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "vserverName"
},
"from": "DCAE",
"version": "1.0.2"
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json
index 5f351a985..014780032 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json
@@ -8,7 +8,9 @@
"target": "generic-vnf.vnf-id",
"AAI": {
"vserver.is-closed-loop-disabled": "false",
- "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1"
+ "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+ "vserver.prov-status": "ACTIVE",
+ "vserver.vserver-name": "vserverName"
},
"from": "DCAE",
"version": "1.0.2"
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js
deleted file mode 100644
index cab75f6cd..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-executor.logger.info(executor.subject.id);
-executor.logger.info(executor.inFields);
-
-var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
- executor.inFields.get("vnfID").toString());
-
-var aaiRequest = new org.onap.policy.aai.AaiNqRequest;
-aaiRequest.setQueryParameters(new org.onap.policy.aai.AaiNqQueryParameters);
-aaiRequest.setInstanceFilters(new org.onap.policy.aai.AaiNqInstanceFilters);
-
-aaiRequest.getQueryParameters().setNamedQuery(new org.onap.policy.aai.AaiNqNamedQuery);
-aaiRequest.getQueryParameters().getNamedQuery().setNamedQueryUuid(executor.inFields.get("requestID"));
-
-var genericVnfInstanceFilterMap = new java.util.HashMap();
-genericVnfInstanceFilterMap.put("vnf-id", vcpeClosedLoopStatus.get("AAI").get("genericVnfVnfId"));
-
-var genericVnfFilterMap = new java.util.HashMap();
-genericVnfFilterMap.put("generic-vnf", genericVnfInstanceFilterMap);
-
-aaiRequest.getInstanceFilters().getInstanceFilter().add(genericVnfFilterMap);
-
-executor.logger.info(aaiRequest);
-
-executor.outFields.put("AAINamedQueryRequest", aaiRequest);
-
-executor.getContextAlbum("ControlLoopExecutionIDAlbum").put(executor.executionId.toString(),
- executor.inFields.get("vnfID"));
-
-executor.logger.info(executor.outFields);
-
-var returnValue = executor.isTrue; \ No newline at end of file
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js
deleted file mode 100644
index 50961c214..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-executor.logger.info(executor.subject.id);
-executor.logger.info(executor.inFields);
-
-var vnfID = executor.getContextAlbum("ControlLoopExecutionIDAlbum").remove(executor.executionId.toString());
-
-executor.logger.info("Continuing execution with VNF ID: " + vnfID);
-
-var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(vnfID.toString());
-executor.logger.info(vcpeClosedLoopStatus);
-
-var aaiResponse = executor.inFields.get("AAINamedQueryResponse");
-
-for (var iterator = aaiResponse.getInventoryResponseItems().iterator(); iterator.hasNext(); ) {
- var responseItem = iterator.next();
-
- if (responseItem.getModelName() != "vCPE") {
- continue;
- }
-
- var aaiInfo = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").getSchemaHelper().createNewSubInstance("VCPE_AAI_Type");
-
- aaiInfo.put("genericVnfResourceVersion", responseItem.getGenericVnf().getResourceVersion());
- aaiInfo.put("genericVnfVnfName", responseItem.getGenericVnf().getVnfName());
- aaiInfo.put("genericVnfProvStatus", responseItem.getGenericVnf().getProvStatus());
- aaiInfo.put("genericVnfIsClosedLoopDisabled", responseItem.getGenericVnf().getIsClosedLoopDisabled().toString());
- aaiInfo.put("genericVnfVnfType", responseItem.getGenericVnf().getVnfType());
- aaiInfo.put("genericVnfInMaint", responseItem.getGenericVnf().getInMaint().toString());
- aaiInfo.put("genericVnfServiceId", responseItem.getGenericVnf().getServiceId());
- aaiInfo.put("genericVnfVnfId", responseItem.getGenericVnf().getVnfId());
-
- aaiInfo.put("genericVnfOrchestrationStatus", responseItem.getVfModule().getOrchestrationStatus());
-
- vcpeClosedLoopStatus.put("AAI", aaiInfo);
-
- break;
-}
-
-// We should check here for the case where AAI returns an error or no data for the query
-
-
-var uuidType = Java.type("java.util.UUID");
-var requestID = uuidType.fromString(vcpeClosedLoopStatus.get("requestID"));
-
-executor.outFields.put("requestID", requestID);
-executor.outFields.put("vnfID", vnfID);
-
-executor.logger.info(executor.outFields);
-
-var returnValue = executor.isTrue;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js
new file mode 100644
index 000000000..fcb39052d
--- /dev/null
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js
@@ -0,0 +1,85 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+executor.logger.info(executor.subject.id);
+executor.logger.info(executor.inFields);
+
+var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
+ executor.inFields.get("vnfID").toString());
+
+executor.logger.info("Executing A&AI Lookup");
+executor.logger.info(vcpeClosedLoopStatus);
+
+var aaiInfo = vcpeClosedLoopStatus.get("AAI");
+
+if (aaiInfo.get("vserverName") == null) {
+ executor.message = "the field vserver.vserver-name must exist in the onset control loop event";
+ executor.logger.warn(executor.message);
+ var returnValue = executor.isFalse;
+}
+else if (aaiInfo.get("genericVnfVnfId") == null && aaiInfo.get("genericVnfVnfName") == null) {
+ executor.message = "either the field generic-vnf.vnf-id or generic-vnf.vnf-name must exist"
+ + " in the onset control loop event";
+ executor.logger.warn(executor.message);
+ var returnValue = executor.isFalse;
+}
+else {
+ var restManager = new org.onap.policy.rest.RestManager;
+ var aaiManager = new org.onap.policy.aai.AaiManager(restManager);
+
+ // We need to instantiate the type in order to trigger the static JAXB handling
+ // in the AaiCqResponse class
+ var aaiCqResponseType = Java.type("org.onap.policy.aai.AaiCqResponse");
+
+ var aaiResponse = aaiManager.getCustomQueryResponse(
+ "http://localhost:54321/OnapVCpeSim/sim",
+ "aai.username",
+ "aai.password",
+ executor.inFields.get("requestID"),
+ vcpeClosedLoopStatus.get("AAI").get("vserverName")
+ );
+
+ var genericVnf;
+
+ if (aaiInfo.get("genericVnfVnfId") != null) {
+ genericVnf = aaiResponse.getGenericVnfByModelInvariantId(aaiInfo.get("genericVnfVnfId"));
+ }
+ else {
+ genericVnf = aaiResponse.getGenericVnfByVnfName(aaiInfo.get("genericVnfVnfId"));
+ }
+
+ aaiInfo.put("genericVnfResourceVersion", genericVnf.getResourceVersion());
+ aaiInfo.put("genericVnfVnfName", genericVnf.getVnfName());
+ aaiInfo.put("genericVnfProvStatus", genericVnf.getProvStatus());
+ aaiInfo.put("genericVnfIsClosedLoopDisabled", genericVnf.isIsClosedLoopDisabled().toString());
+ aaiInfo.put("genericVnfVnfType", genericVnf.getVnfType());
+ aaiInfo.put("genericVnfInMaint", genericVnf.isInMaint().toString());
+ aaiInfo.put("genericVnfServiceId", genericVnf.getServiceId());
+ aaiInfo.put("genericVnfVnfId", genericVnf.getVnfId());
+ aaiInfo.put("genericVnfOrchestrationStatus",
+ genericVnf.getVfModules().getVfModule().get(0).getOrchestrationStatus());
+
+ executor.outFields.put("requestID", executor.inFields.get("requestID"));
+ executor.outFields.put("vnfID", executor.inFields.get("vnfID"));
+
+ executor.logger.info(executor.outFields);
+
+ var returnValue = executor.isTrue;
+}
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js
index 0ba3c0985..f4f6d908d 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js
@@ -5,15 +5,15 @@
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
* Note: The incoming closedloop message can be ONSET with both VNF-name and VNF-ID
* or ABATED with only VNF-name. So need to handle differently. For ABATED case,
* since we still keep the RequireIDVNFID context album, we can get it from there.
@@ -76,7 +76,10 @@ if (clEvent.getAai().get("generic-vnf.vnf-id") != null) {
aaiInfo.put("genericVnfInMaint", clEvent.getAai().get("generic-vnf.in-maint"));
aaiInfo.put("genericVnfServiceId", clEvent.getAai().get("generic-vnf.service-id"));
aaiInfo.put("genericVnfVnfId", clEvent.getAai().get("generic-vnf.vnf-id"));
-
+ aaiInfo.put("vserverIsClosedLoopDisabled", clEvent.getAai().get("vserver.is-closed-loop-disabled"));
+ aaiInfo.put("vserverProvStatus", clEvent.getAai().get("vserver.prov-status"));
+ aaiInfo.put("vserverName", clEvent.getAai().get("vserver.vserver-name"));
+
vcpeClosedLoopStatus.put("AAI", aaiInfo);
if (clEvent.getClosedLoopAlarmEnd() != null) {
@@ -99,14 +102,14 @@ else {
executor.logger.info("No vnf-id in VirtualControlLoopEvent, status:" + clEvent.getClosedLoopEventStatus().toString());
var vnfName = clEvent.getAai().get("generic-vnf.vnf-name");
executor.logger.info("No vnf-id in VirtualControlLoopEvent for " + vnfName);
-
+
vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(vnfName.toString());
-
+
if (vcpeClosedLoopStatus == null) {
executor.logger.info("Creating context information for new vCPE VNF \"" + vnfName.toString() + "\"");
-
+
vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").getSchemaHelper().createNewInstance();
-
+
vcpeClosedLoopStatus.put("closedLoopControlName", clEvent.getClosedLoopControlName());
vcpeClosedLoopStatus.put("closedLoopAlarmStart", clEvent.getClosedLoopAlarmStart().toEpochMilli());
vcpeClosedLoopStatus.put("closedLoopEventClient", clEvent.getClosedLoopEventClient());
@@ -122,24 +125,24 @@ else {
vcpeClosedLoopStatus.put("notification", "ACTIVE");
vcpeClosedLoopStatus.put("notificationTime", java.lang.System.currentTimeMillis());
vcpeClosedLoopStatus.put("message", "");
-
+
var aaiInfo = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").getSchemaHelper().createNewSubInstance("VCPE_AAI_Type");
-
+
aaiInfo.put("genericVnfVnfName", clEvent.getAai().get("generic-vnf.vnf-name"));
vcpeClosedLoopStatus.put("AAI", aaiInfo);
-
+
if (clEvent.getClosedLoopAlarmEnd() != null) {
vcpeClosedLoopStatus.put("closedLoopAlarmEnd", clEvent.getClosedLoopAlarmEnd().toEpochMilli());
} else {
vcpeClosedLoopStatus.put("closedLoopAlarmEnd", java.lang.Long.valueOf(0));
}
-
+
executor.getContextAlbum("VCPEClosedLoopStatusAlbum").put(vnfName.toString(), vcpeClosedLoopStatus);
-
+
executor.logger.info("Created context information for new vCPE VNF \"" + vnfName.toString() + "\"");
}
executor.outFields.put("requestID", requestID);
- executor.outFields.put("vnfName", vnfName);
+ executor.outFields.put("vnfName", vnfName);
executor.logger.info(executor.outFields);
}
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js
deleted file mode 100644
index b397a5f7c..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- * Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-executor.logger.info(executor.subject.id);
-executor.logger.info(executor.inFields);
-
-var returnValue = executor.isTrue;
-
-if( executor.inFields.get("vnfID") == null) {
- executor.logger.info("ReceiveEventPolicyRequestAAIStateTSL: vnfID is null");
- var vnfName = executor.inFields.get("vnfName");
- var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
- executor.inFields.get("vnfName"));
- executor.logger.info("CL event status: " + vcpeClosedLoopStatus.get("closedLoopEventStatus"));
- executor.subject.getTaskKey("NoAAILookupTask").copyTo(executor.selectedTask);
- } else {
- var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
- executor.inFields.get("vnfID").toString());
- var aaiInfo = vcpeClosedLoopStatus.get("AAI");
-
- executor.logger.info(aaiInfo);
-
- if (aaiInfo.get("genericVnfResourceVersion") != null
- && aaiInfo.get("genericVnfVnfName") != null
- && aaiInfo.get("genericVnfProvStatus") != null
- && aaiInfo.get("genericVnfIsClosedLoopDisabled") != null
- && aaiInfo.get("genericVnfOrchestrationStatus") != null
- && aaiInfo.get("genericVnfVnfType") != null
- && aaiInfo.get("genericVnfInMaint") != null
- && aaiInfo.get("genericVnfServiceId") != null
- && aaiInfo.get("genericVnfVnfId") != null) {
- executor.subject.getTaskKey("NoAAILookupTask").copyTo(executor.selectedTask);
- } else {
- executor.subject.getTaskKey("AAILookupRequestTask").copyTo(executor.selectedTask);
- }
-}
-executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask);
diff --git a/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex b/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex
index 571cea9cc..0748cbed1 100644
--- a/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex
+++ b/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex
@@ -5,15 +5,15 @@
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+#
# SPDX-License-Identifier: Apache-2.0
# ============LICENSE_END=========================================================
#-------------------------------------------------------------------------------
@@ -28,9 +28,6 @@ schema create name=UUIDType flavour=Java schema=java.util.UUID
schema create name=VirtualControlLoopEventType flavour=Java schema=org.onap.policy.controlloop.VirtualControlLoopEvent
schema create name=VirtualControlLoopNotificationType flavour=Java schema=org.onap.policy.controlloop.VirtualControlLoopNotification
-schema create name=AAIServiceNamedQueryRequestType flavour=Java schema=org.onap.policy.aai.AaiNqRequest
-schema create name=AAIServiceNamedQueryResponseType flavour=Java schema=org.onap.policy.aai.AaiNqResponse
-
schema create name=APPCLCMRequestType flavour=Java schema=org.onap.policy.appclcm.AppcLcmDmaapWrapper
schema create name=APPCLCMResponseType flavour=Java schema=org.onap.policy.appclcm.AppcLcmDmaapWrapper
@@ -75,12 +72,6 @@ event parameter create name=APPCRestartVNFResponseEvent parName=APPCLCMResponseE
event create name=ControlLoopLogEvent nameSpace=org.onap.policy.apex.onap.vcpe source=APEX target=APEX
event parameter create name=ControlLoopLogEvent parName=VirtualControlLoopNotification schemaName=VirtualControlLoopNotificationType
-event create name=AAINamedQueryRequestEvent nameSpace=org.onap.policy.apex.onap.vcpe source=APEX target=AAI
-event parameter create name=AAINamedQueryRequestEvent parName=AAINamedQueryRequest schemaName=AAIServiceNamedQueryRequestType
-
-event create name=AAINamedQueryResponseEvent nameSpace=org.onap.policy.apex.onap.vcpe source=AAI target=APEX
-event parameter create name=AAINamedQueryResponseEvent parName=AAINamedQueryResponse schemaName=AAIServiceNamedQueryResponseType
-
task create name=GetVCPEStateTask
task inputfield create name=GetVCPEStateTask fieldName=VirtualControlLoopEvent schemaName=VirtualControlLoopEventType
@@ -197,32 +188,18 @@ task logic create name=ControlLoopLogTask logicFlavour=JAVASCRIPT logic=LS
#MACROFILE:"src/main/resources/logic/ControlLoopLogTask.js"
LE
-task create name=AAILookupRequestTask
+task create name=AAILookupTask
-task inputfield create name=AAILookupRequestTask fieldName=requestID schemaName=UUIDType
-task inputfield create name=AAILookupRequestTask fieldName=vnfID schemaName=UUIDType
+task inputfield create name=AAILookupTask fieldName=requestID schemaName=UUIDType
+task inputfield create name=AAILookupTask fieldName=vnfID schemaName=UUIDType
-task outputfield create name=AAILookupRequestTask fieldName=AAINamedQueryRequest schemaName=AAIServiceNamedQueryRequestType
+task outputfield create name=AAILookupTask fieldName=requestID schemaName=UUIDType
+task outputfield create name=AAILookupTask fieldName=vnfID schemaName=UUIDType
-task contextref create name=AAILookupRequestTask albumName=VCPEClosedLoopStatusAlbum
-task contextref create name=AAILookupRequestTask albumName=ControlLoopExecutionIDAlbum
+task contextref create name=AAILookupTask albumName=VCPEClosedLoopStatusAlbum
-task logic create name=AAILookupRequestTask logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/AAILookupRequestTask.js"
-LE
-
-task create name=AAILookupResponseTask
-
-task inputfield create name=AAILookupResponseTask fieldName=AAINamedQueryResponse schemaName=AAIServiceNamedQueryResponseType
-
-task outputfield create name=AAILookupResponseTask fieldName=requestID schemaName=UUIDType
-task outputfield create name=AAILookupResponseTask fieldName=vnfID schemaName=UUIDType
-
-task contextref create name=AAILookupResponseTask albumName=VCPEClosedLoopStatusAlbum
-task contextref create name=AAILookupResponseTask albumName=ControlLoopExecutionIDAlbum
-
-task logic create name=AAILookupResponseTask logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/AAILookupResponseTask.js"
+task logic create name=AAILookupTask logicFlavour=JAVASCRIPT logic=LS
+#MACROFILE:"src/main/resources/logic/AAILookupTask.js"
LE
task create name=NoAAILookupTask
@@ -239,7 +216,7 @@ LE
#
# ReceiveEventPolicy
-#
+#
policy create name=ReceiveEventPolicy template=Freestyle firstState=GetVCPEState
policy state create name=ReceiveEventPolicy stateName=AbatedState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
@@ -258,50 +235,19 @@ policy state selecttasklogic create name=ReceiveEventPolicy stateName=OnsetOrAba
#MACROFILE:"src/main/resources/logic/OnsetOrAbatedStateTSL.js"
LE
-policy state create name=ReceiveEventPolicy stateName=RequestAAIState triggerName=VCPEStateUpdatedEvent defaultTaskName=AAILookupRequestTask
-policy state output create name=ReceiveEventPolicy stateName=RequestAAIState outputName=RequestAAIStateOutput eventName=AAINamedQueryRequestEvent
-policy state taskref create name=ReceiveEventPolicy stateName=RequestAAIState taskName=AAILookupRequestTask outputType=DIRECT outputName=RequestAAIStateOutput
-policy state output create name=ReceiveEventPolicy stateName=RequestAAIState outputName=DoNotRequestAAIStateOutput eventName=VCPEStateUpdatedEvent nextState=OnsetOrAbatedState
-policy state taskref create name=ReceiveEventPolicy stateName=RequestAAIState taskName=NoAAILookupTask outputType=DIRECT outputName=DoNotRequestAAIStateOutput
+policy state create name=ReceiveEventPolicy stateName=RequestAAIState triggerName=VCPEStateUpdatedEvent defaultTaskName=AAILookupTask
+policy state output create name=ReceiveEventPolicy stateName=RequestAAIState outputName=RequestAAIStateOutput eventName=VCPEStateUpdatedEvent nextState=OnsetOrAbatedState
+policy state taskref create name=ReceiveEventPolicy stateName=RequestAAIState taskName=AAILookupTask outputType=DIRECT outputName=RequestAAIStateOutput
policy state contextref create name=ReceiveEventPolicy stateName=RequestAAIState albumName=VCPEClosedLoopStatusAlbum
-policy state selecttasklogic create name=ReceiveEventPolicy stateName=RequestAAIState logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js"
-LE
-
policy state create name=ReceiveEventPolicy stateName=GetVCPEState triggerName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e defaultTaskName=GetVCPEStateTask
policy state output create name=ReceiveEventPolicy stateName=GetVCPEState outputName=GetVCPEStateOutput eventName=VCPEStateUpdatedEvent nextState=RequestAAIState
policy state taskref create name=ReceiveEventPolicy stateName=GetVCPEState taskName=GetVCPEStateTask outputType=DIRECT outputName=GetVCPEStateOutput
#
-# AAIResponsePolicy
-#
-policy create name=AAIResponsePolicy template=Freestyle firstState=AAIResponseState
-
-policy state create name=AAIResponsePolicy stateName=AbatedState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
-policy state output create name=AAIResponsePolicy stateName=AbatedState outputName=AbatedOutput eventName=ControlLoopLogEvent
-policy state taskref create name=AAIResponsePolicy stateName=AbatedState taskName=ControlLoopLogTask outputType=DIRECT outputName=AbatedOutput
-
-policy state create name=AAIResponsePolicy stateName=OnsetOrAbatedState triggerName=VCPEStateUpdatedEvent defaultTaskName=AbatedTask
-policy state output create name=AAIResponsePolicy stateName=OnsetOrAbatedState outputName=OnsetOutput eventName=GuardRequestEvent
-policy state taskref create name=AAIResponsePolicy stateName=OnsetOrAbatedState taskName=GuardRequestTask outputType=DIRECT outputName=OnsetOutput
-policy state output create name=AAIResponsePolicy stateName=OnsetOrAbatedState outputName=AbatedOutput eventName=VCPEStateUpdatedEvent nextState=AbatedState
-policy state taskref create name=AAIResponsePolicy stateName=OnsetOrAbatedState taskName=AbatedTask outputType=DIRECT outputName=AbatedOutput
-
-policy state contextref create name=AAIResponsePolicy stateName=OnsetOrAbatedState albumName=VCPEClosedLoopStatusAlbum
-
-policy state selecttasklogic create name=AAIResponsePolicy stateName=OnsetOrAbatedState logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/OnsetOrAbatedStateTSL.js"
-LE
-
-policy state create name=AAIResponsePolicy stateName=AAIResponseState triggerName=AAINamedQueryResponseEvent defaultTaskName=AAILookupResponseTask
-policy state output create name=AAIResponsePolicy stateName=AAIResponseState outputName=AAIResponseStateOutput eventName=VCPEStateUpdatedEvent nextState=OnsetOrAbatedState
-policy state taskref create name=AAIResponsePolicy stateName=AAIResponseState taskName=AAILookupResponseTask outputType=DIRECT outputName=AAIResponseStateOutput
-
-#
# RestartAPPCRequestPolicy
-#
+#
policy create name=RestartAPPCRequestPolicy template=Freestyle firstState=PolicyGuardResponseState
policy state create name=RestartAPPCRequestPolicy stateName=DeniedState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
@@ -326,7 +272,7 @@ LE
#
# RestartAPPCResponsePolicy
-#
+#
policy create name=RestartAPPCResponsePolicy template=Freestyle firstState=RestartAPPCResponseState
policy state create name=RestartAPPCResponsePolicy stateName=ResponseLogState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
index cc83c5219..b02287d2a 100644
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
+++ b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
@@ -44,6 +44,18 @@
{
"name": "genericVnfVnfId",
"type": "string"
+ },
+ {
+ "name": "vserverIsClosedLoopDisabled",
+ "type": "string"
+ },
+ {
+ "name": "vserverName",
+ "type": "string"
+ },
+ {
+ "name": "vserverProvStatus",
+ "type": "string"
}
]
}
diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java
index 61100d4f4..5eb8fd338 100644
--- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java
+++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVCpeSimEndpoint.java
@@ -66,6 +66,8 @@ public class OnapVCpeSimEndpoint {
private static final Gson gson = new GsonBuilder()
.registerTypeAdapter(Instant.class, new Serialization.GsonInstantAdapter()).create();
+ private static final AtomicInteger nextVnfId = new AtomicInteger(0);
+
/**
* Service get stats.
*
@@ -91,7 +93,7 @@ public class OnapVCpeSimEndpoint {
public Response serviceGuardPostRequest(final String jsonString) {
LOGGER.info("\n*** GUARD REQUEST START ***\n" + jsonString + "\n *** GUARD REQUEST END ***");
- String target = jsonString.substring(jsonString.indexOf("b4fe00ac"));
+ String target = jsonString.substring(jsonString.indexOf("00000000"));
target = target.substring(0, target.indexOf('"'));
int thisGuardMessageNumber = guardMessagesReceived.incrementAndGet();
@@ -128,8 +130,12 @@ public class OnapVCpeSimEndpoint {
LOGGER.info("\n*** AAI NODE QUERY GET START ***\nsearchNodeType=" + searchNodeType + "\nfilter=" + filter
+ "\n *** AAI REQUEST END ***");
+ String adjustedVserverUuid = "b4fe00ac-1da6-4b00-ac0d-8e8300db"
+ + String.format("%04d", nextVnfId.getAndIncrement());
+
String responseJsonString = TextFileUtils
- .getTextFileAsString("src/test/resources/aai/SearchNodeTypeResponse.json");
+ .getTextFileAsString("src/test/resources/aai/SearchNodeTypeResponse.json")
+ .replaceAll("b4fe00ac-1da6-4b00-ac0d-8e8300db0007", adjustedVserverUuid);
LOGGER.info("\n*** AAI RESPONSE START ***\n" + responseJsonString + "\n *** AAI RESPONSE END ***");
@@ -154,7 +160,12 @@ public class OnapVCpeSimEndpoint {
LOGGER.info("\n*** AAI NODE RESOURE POST QUERY START ***\\nformat=" + format + "\njson=" + jsonString
+ "\n *** AAI REQUEST END ***");
- String responseJsonString = TextFileUtils.getTextFileAsString("src/test/resources/aai/NodeQueryResponse.json");
+ int beginIndex = jsonString.indexOf("b4fe00ac-1da6-4b00-ac0d-8e8300db")
+ + "b4fe00ac-1da6-4b00-ac0d-8e8300db".length();
+ String nextVnfIdUrlEnding = jsonString.substring(beginIndex, beginIndex + 4);
+ String responseJsonString = TextFileUtils.getTextFileAsString("src/test/resources/aai/NodeQueryResponse.json")
+ .replaceAll("bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38",
+ "00000000-0000-0000-0000-00000000" + nextVnfIdUrlEnding);
LOGGER.info("\n*** AAI RESPONSE START ***\n" + responseJsonString + "\n *** AAI RESPONSE END ***");
diff --git a/examples/examples-onap-vcpe/src/test/resources/aai/NodeQueryResponse.json b/examples/examples-onap-vcpe/src/test/resources/aai/NodeQueryResponse.json
index 7d562710d..82c202c17 100644
--- a/examples/examples-onap-vcpe/src/test/resources/aai/NodeQueryResponse.json
+++ b/examples/examples-onap-vcpe/src/test/resources/aai/NodeQueryResponse.json
@@ -3,8 +3,8 @@
{
"vserver": {
"vserver-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0007",
- "vserver-name": "Ete_vFWCLvFWSNK_7ba1fbde_0",
- "vserver-name2": "Ete_vFWCLvFWSNK_7ba1fbde_0",
+ "vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_0",
+ "vserver-name2": "Ete_vCPECLvCPESNK_7ba1fbde_0",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
"in-maint": false,
@@ -15,11 +15,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vFWCLvFWSNK_7ba1fbde_0",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vCPECLvCPESNK_7ba1fbde_0",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "relationship-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -36,7 +36,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -110,7 +110,7 @@
"l-interfaces": {
"l-interface": [
{
- "interface-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0-vfw_0_int_unprotected_private_port_0-u2lkra6bpz7l",
+ "interface-name": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0-vcpe_0_int_unprotected_private_port_0-u2lkra6bpz7l",
"interface-id": "bd621b3f-da40-4a8a-a703-3db290295cd9",
"macaddr": "fa:16:3e:0c:27:e4",
"network-name": "4e291560-92f8-4822-9dcf-dd75c04c9617",
@@ -120,7 +120,7 @@
"is-ip-unnumbered": false
},
{
- "interface-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0-vfw_0_onap_private_port_0-nfvykwarrnxr",
+ "interface-name": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0-vcpe_0_onap_private_port_0-nfvykwarrnxr",
"interface-id": "86bbce7d-51ba-4ad2-a34a-aa2742f9789f",
"macaddr": "fa:16:3e:39:d9:27",
"network-name": "3ef9d123-0d09-4400-8ed0-c0fd5c76aa2b",
@@ -130,7 +130,7 @@
"is-ip-unnumbered": false
},
{
- "interface-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0-vfw_0_int_protected_private_port_0-bz3hsoxjcgyw",
+ "interface-name": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0-vcpe_0_int_protected_private_port_0-bz3hsoxjcgyw",
"interface-id": "b1a8a573-d70d-4b32-b717-21fd6bb549a6",
"macaddr": "fa:16:3e:95:1d:e9",
"network-name": "47cae58a-b052-4f73-8f42-e154c260d5df",
@@ -146,8 +146,8 @@
{
"generic-vnf": {
"vnf-id": "f17face5-69cb-4c88-9e0b-7426db7edddd",
- "vnf-name": "Ete_vFWCLvFWSNK_7ba1fbde_0",
- "vnf-type": "vFWCL 2019-05-01 15:30:/vFWCL_vFWSNK bbefb8ce-2bde 0",
+ "vnf-name": "Ete_vCPECLvCPESNK_7ba1fbde_0",
+ "vnf-type": "vCPECL 2019-05-01 15:30:/vCPECL_vCPESNK bbefb8ce-2bde 0",
"service-id": "e591441a-e649-4490-82e0-07dac05d674b",
"prov-status": "ACTIVE",
"orchestration-status": "Active",
@@ -162,7 +162,7 @@
{
"related-to": "service-instance",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vCPECL/service-instances/service-instance/7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -170,7 +170,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
},
{
"relationship-key": "service-instance.service-instance-id",
@@ -220,7 +220,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkfbde"
+ "property-value": "democpel01snkfbde"
}
]
},
@@ -249,7 +249,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
}
@@ -259,8 +259,8 @@
"vf-module": [
{
"vf-module-id": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
- "vf-module-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0",
- "heat-stack-id": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0/6769f192-0579-4dab-b4e7-170d334c37dd",
+ "vf-module-name": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0",
+ "heat-stack-id": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0/6769f192-0579-4dab-b4e7-170d334c37dd",
"orchestration-status": "active",
"is-base-vf-module": true,
"automated-assignment": false,
@@ -296,7 +296,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkfbde"
+ "property-value": "democpel01snkfbde"
}
]
},
@@ -325,7 +325,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
}
@@ -339,7 +339,7 @@
{
"model-ver": {
"model-version-id": "189a5070-3bd5-45ac-8a1d-c84ca40b277b",
- "model-name": "vFWCL_vFWSNK bbefb8ce-2bde",
+ "model-name": "vCPECL_vCPESNK bbefb8ce-2bde",
"model-version": "1.0",
"model-description": "vendor software product",
"resource-version": "1556724755172",
@@ -416,7 +416,7 @@
"model-ver": [
{
"model-version-id": "189a5070-3bd5-45ac-8a1d-c84ca40b277b",
- "model-name": "vFWCL_vFWSNK bbefb8ce-2bde",
+ "model-name": "vCPECL_vCPESNK bbefb8ce-2bde",
"model-version": "1.0",
"model-description": "vendor software product",
"resource-version": "1556724755172",
@@ -499,7 +499,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvPKG_7ba1fbde_1"
+ "property-value": "Ete_vCPECLvPKG_7ba1fbde_1"
}
]
},
@@ -516,7 +516,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
}
@@ -527,7 +527,7 @@
{
"model-ver": {
"model-version-id": "a03b1102-ac3b-44dd-8862-9b94f1951040",
- "model-name": "vFWCL 2019-05-01 15:30:",
+ "model-name": "vCPECL 2019-05-01 15:30:",
"model-version": "1.0",
"distribution-status": "DISTRIBUTION_COMPLETE_OK",
"model-description": "catalog service description",
@@ -578,7 +578,7 @@
"model-ver": [
{
"model-version-id": "a03b1102-ac3b-44dd-8862-9b94f1951040",
- "model-name": "vFWCL 2019-05-01 15:30:",
+ "model-name": "vCPECL 2019-05-01 15:30:",
"model-version": "1.0",
"distribution-status": "DISTRIBUTION_COMPLETE_OK",
"model-description": "catalog service description",
@@ -591,8 +591,8 @@
{
"generic-vnf": {
"vnf-id": "9cd7da50-723c-418c-a91d-af2866844a5d",
- "vnf-name": "Ete_vFWCLvPKG_7ba1fbde_1",
- "vnf-type": "vFWCL 2019-05-01 15:30:/vFWCL_vPKG 5101f6c6-8df3 0",
+ "vnf-name": "Ete_vCPECLvPKG_7ba1fbde_1",
+ "vnf-type": "vCPECL 2019-05-01 15:30:/vCPECL_vPKG 5101f6c6-8df3 0",
"service-id": "e591441a-e649-4490-82e0-07dac05d674b",
"prov-status": "ACTIVE",
"orchestration-status": "Active",
@@ -607,7 +607,7 @@
{
"related-to": "service-instance",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vCPECL/service-instances/service-instance/7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -615,7 +615,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
},
{
"relationship-key": "service-instance.service-instance-id",
@@ -665,7 +665,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01pgnfbde"
+ "property-value": "democpel01pgnfbde"
}
]
}
@@ -675,8 +675,8 @@
"vf-module": [
{
"vf-module-id": "04bcd430-e1ef-4da5-a67e-3dd80463a725",
- "vf-module-name": "Vfmodule_Ete_vFWCLvPKG_7ba1fbde_1",
- "heat-stack-id": "Vfmodule_Ete_vFWCLvPKG_7ba1fbde_1/6f9827e8-68fb-45e9-a19e-e2246a43df14",
+ "vf-module-name": "Vfmodule_Ete_vCPECLvPKG_7ba1fbde_1",
+ "heat-stack-id": "Vfmodule_Ete_vCPECLvPKG_7ba1fbde_1/6f9827e8-68fb-45e9-a19e-e2246a43df14",
"orchestration-status": "active",
"is-base-vf-module": true,
"automated-assignment": false,
@@ -712,7 +712,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01pgnfbde"
+ "property-value": "democpel01pgnfbde"
}
]
}
@@ -726,8 +726,8 @@
{
"vf-module": {
"vf-module-id": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
- "vf-module-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0",
- "heat-stack-id": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0/6769f192-0579-4dab-b4e7-170d334c37dd",
+ "vf-module-name": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0",
+ "heat-stack-id": "Vfmodule_Ete_vCPECLvCPESNK_7ba1fbde_0/6769f192-0579-4dab-b4e7-170d334c37dd",
"orchestration-status": "active",
"is-base-vf-module": true,
"automated-assignment": false,
@@ -763,7 +763,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkfbde"
+ "property-value": "democpel01snkfbde"
}
]
},
@@ -792,7 +792,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
}
@@ -803,7 +803,7 @@
{
"model-ver": {
"model-version-id": "94b18b1d-cc91-4f43-911a-e6348665f292",
- "model-name": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
+ "model-name": "vCPECLvCPESNKBbefb8ce2bde..base_vcpe..module-0",
"model-version": "1",
"resource-version": "1556724754936",
"model-elements": {
@@ -879,7 +879,7 @@
"model-ver": [
{
"model-version-id": "94b18b1d-cc91-4f43-911a-e6348665f292",
- "model-name": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
+ "model-name": "vCPECLvCPESNKBbefb8ce2bde..base_vcpe..module-0",
"model-version": "1",
"resource-version": "1556724754936",
"relationship-list": {
@@ -923,8 +923,8 @@
"vserver": [
{
"vserver-id": "f7807a27-1c45-4e79-9e61-6fb33ee4b7e7",
- "vserver-name": "Ete_vFWCLvFWSNK_38fbaf46_0",
- "vserver-name2": "Ete_vFWCLvFWSNK_38fbaf46_0",
+ "vserver-name": "Ete_vCPECLvCPESNK_38fbaf46_0",
+ "vserver-name2": "Ete_vCPECLvCPESNK_38fbaf46_0",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/f7807a27-1c45-4e79-9e61-6fb33ee4b7e7",
"in-maint": false,
@@ -945,18 +945,18 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
+ "property-value": "Ete_vCPECLvCPESNK_38fbaf46_0"
}
]
},
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vFWCLvFWSNK_38fbaf46_0",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vCPECLvCPESNK_38fbaf46_0",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
+ "relationship-value": "Ete_vCPECLvCPESNK_38fbaf46_0"
}
]
},
@@ -1030,8 +1030,8 @@
},
{
"vserver-id": "900dc2db-1d65-41ef-8b13-9b9b605cb0bd",
- "vserver-name": "vofwl01snkf0ef",
- "vserver-name2": "vofwl01snkf0ef",
+ "vserver-name": "vocpel01snkf0ef",
+ "vserver-name2": "vocpel01snkf0ef",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/900dc2db-1d65-41ef-8b13-9b9b605cb0bd",
"in-maint": false,
@@ -1052,18 +1052,18 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvFWSNK_8edbf0ef_1"
+ "property-value": "Ete_vCPEDTvCPESNK_8edbf0ef_1"
}
]
},
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01snkf0ef",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01snkf0ef",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01snkf0ef"
+ "relationship-value": "vocpel01snkf0ef"
}
]
},
@@ -1137,8 +1137,8 @@
},
{
"vserver-id": "cc93aa76-e88d-43a6-8e3b-331918dd3eab",
- "vserver-name": "demofwl01pgnaf46",
- "vserver-name2": "demofwl01pgnaf46",
+ "vserver-name": "democpel01pgnaf46",
+ "vserver-name2": "democpel01pgnaf46",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/cc93aa76-e88d-43a6-8e3b-331918dd3eab",
"in-maint": false,
@@ -1149,11 +1149,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01pgnaf46",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/democpel01pgnaf46",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "demofwl01pgnaf46"
+ "relationship-value": "democpel01pgnaf46"
}
]
},
@@ -1170,7 +1170,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvPKG_38fbaf46_1"
+ "property-value": "Ete_vCPECLvPKG_38fbaf46_1"
}
]
},
@@ -1244,8 +1244,8 @@
},
{
"vserver-id": "ab342d19-f3e6-420b-8481-ed7f16c43dfa",
- "vserver-name": "demofwl01snkaf46",
- "vserver-name2": "demofwl01snkaf46",
+ "vserver-name": "democpel01snkaf46",
+ "vserver-name2": "democpel01snkaf46",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/ab342d19-f3e6-420b-8481-ed7f16c43dfa",
"in-maint": false,
@@ -1266,18 +1266,18 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
+ "property-value": "Ete_vCPECLvCPESNK_38fbaf46_0"
}
]
},
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01snkaf46",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/democpel01snkaf46",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "demofwl01snkaf46"
+ "relationship-value": "democpel01snkaf46"
}
]
},
@@ -1351,8 +1351,8 @@
},
{
"vserver-id": "2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8",
- "vserver-name": "vofwl01vfw8ab3",
- "vserver-name2": "vofwl01vfw8ab3",
+ "vserver-name": "vocpel01vcpe8ab3",
+ "vserver-name2": "vocpel01vcpe8ab3",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8",
"in-maint": false,
@@ -1363,11 +1363,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01vfw8ab3",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01vcpe8ab3",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01vfw8ab3"
+ "relationship-value": "vocpel01vcpe8ab3"
}
]
},
@@ -1384,7 +1384,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvFWSNK_8b908ab3_1"
+ "property-value": "Ete_vCPEDTvCPESNK_8b908ab3_1"
}
]
},
@@ -1458,8 +1458,8 @@
},
{
"vserver-id": "91277106-90d3-450d-8a10-9aa9a8727d6e",
- "vserver-name": "vofwl01pgnf0ef",
- "vserver-name2": "vofwl01pgnf0ef",
+ "vserver-name": "vocpel01pgnf0ef",
+ "vserver-name2": "vocpel01pgnf0ef",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/91277106-90d3-450d-8a10-9aa9a8727d6e",
"in-maint": false,
@@ -1480,18 +1480,18 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvPKG_8edbf0ef_0"
+ "property-value": "Ete_vCPEDTvPKG_8edbf0ef_0"
}
]
},
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01pgnf0ef",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01pgnf0ef",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01pgnf0ef"
+ "relationship-value": "vocpel01pgnf0ef"
}
]
},
@@ -1565,8 +1565,8 @@
},
{
"vserver-id": "801da076-918a-4911-b87c-b44ce62822a9",
- "vserver-name": "vofwl01pgn8ab3",
- "vserver-name2": "vofwl01pgn8ab3",
+ "vserver-name": "vocpel01pgn8ab3",
+ "vserver-name2": "vocpel01pgn8ab3",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/801da076-918a-4911-b87c-b44ce62822a9",
"in-maint": false,
@@ -1577,11 +1577,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01pgn8ab3",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01pgn8ab3",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01pgn8ab3"
+ "relationship-value": "vocpel01pgn8ab3"
}
]
},
@@ -1598,7 +1598,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvPKG_8b908ab3_0"
+ "property-value": "Ete_vCPEDTvPKG_8b908ab3_0"
}
]
},
@@ -1672,8 +1672,8 @@
},
{
"vserver-id": "8a503052-a89c-4035-94ec-b3ab1e157b49",
- "vserver-name": "vofwl01vfwf0ef",
- "vserver-name2": "vofwl01vfwf0ef",
+ "vserver-name": "vocpel01vcpef0ef",
+ "vserver-name2": "vocpel01vcpef0ef",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/8a503052-a89c-4035-94ec-b3ab1e157b49",
"in-maint": false,
@@ -1694,18 +1694,18 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvFWSNK_8edbf0ef_1"
+ "property-value": "Ete_vCPEDTvCPESNK_8edbf0ef_1"
}
]
},
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01vfwf0ef",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01vcpef0ef",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01vfwf0ef"
+ "relationship-value": "vocpel01vcpef0ef"
}
]
},
@@ -1779,8 +1779,8 @@
},
{
"vserver-id": "39a77e27-ced1-444c-a5b6-f73135e09225",
- "vserver-name": "vofwl01snk8ab3",
- "vserver-name2": "vofwl01snk8ab3",
+ "vserver-name": "vocpel01snk8ab3",
+ "vserver-name2": "vocpel01snk8ab3",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/39a77e27-ced1-444c-a5b6-f73135e09225",
"in-maint": false,
@@ -1791,11 +1791,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01snk8ab3",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01snk8ab3",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01snk8ab3"
+ "relationship-value": "vocpel01snk8ab3"
}
]
},
@@ -1812,7 +1812,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvFWSNK_8b908ab3_1"
+ "property-value": "Ete_vCPEDTvCPESNK_8b908ab3_1"
}
]
},
@@ -1886,8 +1886,8 @@
},
{
"vserver-id": "0e581a27-5184-48b1-88b1-e81c5b5a450c",
- "vserver-name": "vofwl01snk8ab3",
- "vserver-name2": "vofwl01snk8ab3",
+ "vserver-name": "vocpel01snk8ab3",
+ "vserver-name2": "vocpel01snk8ab3",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/0e581a27-5184-48b1-88b1-e81c5b5a450c",
"in-maint": false,
@@ -1898,11 +1898,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01snk8ab3",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01snk8ab3",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01snk8ab3"
+ "relationship-value": "vocpel01snk8ab3"
}
]
},
@@ -1919,7 +1919,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvFWSNK_8b908ab3_2"
+ "property-value": "Ete_vCPEDTvCPESNK_8b908ab3_2"
}
]
},
@@ -1993,8 +1993,8 @@
},
{
"vserver-id": "c103ce57-6662-49e0-a589-ebfd91f05c79",
- "vserver-name": "vofwl01vfw8ab3",
- "vserver-name2": "vofwl01vfw8ab3",
+ "vserver-name": "vocpel01vcpe8ab3",
+ "vserver-name2": "vocpel01vcpe8ab3",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/c103ce57-6662-49e0-a589-ebfd91f05c79",
"in-maint": false,
@@ -2005,11 +2005,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01vfw8ab3",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/vocpel01vcpe8ab3",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "vofwl01vfw8ab3"
+ "relationship-value": "vocpel01vcpe8ab3"
}
]
},
@@ -2026,7 +2026,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWDTvFWSNK_8b908ab3_2"
+ "property-value": "Ete_vCPEDTvCPESNK_8b908ab3_2"
}
]
},
@@ -2100,8 +2100,8 @@
},
{
"vserver-id": "b75ccb62-131b-4e76-adad-28636fc60fb8",
- "vserver-name": "demofwl01snkfbde",
- "vserver-name2": "demofwl01snkfbde",
+ "vserver-name": "democpel01snkfbde",
+ "vserver-name2": "democpel01snkfbde",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/b75ccb62-131b-4e76-adad-28636fc60fb8",
"in-maint": false,
@@ -2112,11 +2112,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01snkfbde",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/democpel01snkfbde",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "demofwl01snkfbde"
+ "relationship-value": "democpel01snkfbde"
}
]
},
@@ -2133,7 +2133,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -2207,8 +2207,8 @@
},
{
"vserver-id": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
- "vserver-name": "Ete_vFWCLvFWSNK_7ba1fbde_0",
- "vserver-name2": "Ete_vFWCLvFWSNK_7ba1fbde_0",
+ "vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_0",
+ "vserver-name2": "Ete_vCPECLvCPESNK_7ba1fbde_0",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
"in-maint": false,
@@ -2219,11 +2219,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vFWCLvFWSNK_7ba1fbde_0",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vCPECLvCPESNK_7ba1fbde_0",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "relationship-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -2240,7 +2240,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -2314,8 +2314,8 @@
},
{
"vserver-id": "80465c73-3481-4d9d-9d3b-ab4016dfffe7",
- "vserver-name": "demofwl01pgnfbde",
- "vserver-name2": "demofwl01pgnfbde",
+ "vserver-name": "democpel01pgnfbde",
+ "vserver-name2": "democpel01pgnfbde",
"prov-status": "ACTIVE",
"vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/80465c73-3481-4d9d-9d3b-ab4016dfffe7",
"in-maint": false,
@@ -2326,11 +2326,11 @@
{
"related-to": "vnfc",
"relationship-label": "tosca.relationships.HostedOn",
- "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01pgnfbde",
+ "related-link": "/aai/v15/network/vnfcs/vnfc/democpel01pgnfbde",
"relationship-data": [
{
"relationship-key": "vnfc.vnfc-name",
- "relationship-value": "demofwl01pgnfbde"
+ "relationship-value": "democpel01pgnfbde"
}
]
},
@@ -2347,7 +2347,7 @@
"related-to-property": [
{
"property-key": "generic-vnf.vnf-name",
- "property-value": "Ete_vFWCLvPKG_7ba1fbde_1"
+ "property-value": "Ete_vCPECLvPKG_7ba1fbde_1"
}
]
},
@@ -2426,7 +2426,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2434,7 +2434,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
@@ -2486,7 +2486,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFW",
+ "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPE",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2494,7 +2494,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFW"
+ "relationship-value": "vCPE"
}
]
},
@@ -2546,7 +2546,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW",
+ "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2554,7 +2554,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFW"
+ "relationship-value": "vCPE"
}
]
},
@@ -2576,7 +2576,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_8568f3da-8821-4600-b95f-6224f15943f7/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_8568f3da-8821-4600-b95f-6224f15943f7/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2584,14 +2584,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2599,14 +2599,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2614,14 +2614,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41/service-subscriptions/service-subscription/vFWDT",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41/service-subscriptions/service-subscription/vCPEDT",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2629,7 +2629,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWDT"
+ "relationship-value": "vCPEDT"
}
]
},
@@ -2651,7 +2651,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591/service-subscriptions/service-subscription/vFWDT",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591/service-subscriptions/service-subscription/vCPEDT",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2659,14 +2659,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWDT"
+ "relationship-value": "vCPEDT"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2/service-subscriptions/service-subscription/vFWDT",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2/service-subscriptions/service-subscription/vCPEDT",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2674,14 +2674,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWDT"
+ "relationship-value": "vCPEDT"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2689,7 +2689,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
}
@@ -2717,7 +2717,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2725,7 +2725,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
@@ -2777,7 +2777,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFW",
+ "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPE",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2785,7 +2785,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFW"
+ "relationship-value": "vCPE"
}
]
},
@@ -2837,7 +2837,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW",
+ "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2845,7 +2845,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFW"
+ "relationship-value": "vCPE"
}
]
},
@@ -2867,7 +2867,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_8568f3da-8821-4600-b95f-6224f15943f7/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_8568f3da-8821-4600-b95f-6224f15943f7/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2875,14 +2875,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2890,14 +2890,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2905,14 +2905,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41/service-subscriptions/service-subscription/vFWDT",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41/service-subscriptions/service-subscription/vCPEDT",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2920,7 +2920,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWDT"
+ "relationship-value": "vCPEDT"
}
]
},
@@ -2942,7 +2942,7 @@
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591/service-subscriptions/service-subscription/vFWDT",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591/service-subscriptions/service-subscription/vCPEDT",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2950,14 +2950,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWDT"
+ "relationship-value": "vCPEDT"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2/service-subscriptions/service-subscription/vFWDT",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2/service-subscriptions/service-subscription/vCPEDT",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2965,14 +2965,14 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWDT"
+ "relationship-value": "vCPEDT"
}
]
},
{
"related-to": "service-subscription",
"relationship-label": "org.onap.relationships.inventory.Uses",
- "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL",
+ "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vCPECL",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
@@ -2980,7 +2980,7 @@
},
{
"relationship-key": "service-subscription.service-type",
- "relationship-value": "vFWCL"
+ "relationship-value": "vCPECL"
}
]
}
@@ -3027,7 +3027,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
+ "property-value": "Ete_vCPECLvCPESNK_38fbaf46_0"
}
]
},
@@ -3056,7 +3056,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01snkf0ef"
+ "property-value": "vocpel01snkf0ef"
}
]
},
@@ -3085,7 +3085,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01pgnaf46"
+ "property-value": "democpel01pgnaf46"
}
]
},
@@ -3114,7 +3114,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkaf46"
+ "property-value": "democpel01snkaf46"
}
]
},
@@ -3143,7 +3143,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01vfw8ab3"
+ "property-value": "vocpel01vcpe8ab3"
}
]
},
@@ -3172,7 +3172,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01pgnf0ef"
+ "property-value": "vocpel01pgnf0ef"
}
]
},
@@ -3201,7 +3201,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01pgn8ab3"
+ "property-value": "vocpel01pgn8ab3"
}
]
},
@@ -3230,7 +3230,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01vfwf0ef"
+ "property-value": "vocpel01vcpef0ef"
}
]
},
@@ -3259,7 +3259,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01snk8ab3"
+ "property-value": "vocpel01snk8ab3"
}
]
},
@@ -3288,7 +3288,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01snk8ab3"
+ "property-value": "vocpel01snk8ab3"
}
]
},
@@ -3317,7 +3317,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01vfw8ab3"
+ "property-value": "vocpel01vcpe8ab3"
}
]
},
@@ -3346,7 +3346,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkfbde"
+ "property-value": "democpel01snkfbde"
}
]
},
@@ -3375,7 +3375,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -3404,7 +3404,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01pgnfbde"
+ "property-value": "democpel01pgnfbde"
}
]
}
@@ -3453,7 +3453,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
+ "property-value": "Ete_vCPECLvCPESNK_38fbaf46_0"
}
]
},
@@ -3482,7 +3482,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01snkf0ef"
+ "property-value": "vocpel01snkf0ef"
}
]
},
@@ -3511,7 +3511,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01pgnaf46"
+ "property-value": "democpel01pgnaf46"
}
]
},
@@ -3540,7 +3540,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkaf46"
+ "property-value": "democpel01snkaf46"
}
]
},
@@ -3569,7 +3569,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01vfw8ab3"
+ "property-value": "vocpel01vcpe8ab3"
}
]
},
@@ -3598,7 +3598,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01pgnf0ef"
+ "property-value": "vocpel01pgnf0ef"
}
]
},
@@ -3627,7 +3627,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01pgn8ab3"
+ "property-value": "vocpel01pgn8ab3"
}
]
},
@@ -3656,7 +3656,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01vfwf0ef"
+ "property-value": "vocpel01vcpef0ef"
}
]
},
@@ -3685,7 +3685,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01snk8ab3"
+ "property-value": "vocpel01snk8ab3"
}
]
},
@@ -3714,7 +3714,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01snk8ab3"
+ "property-value": "vocpel01snk8ab3"
}
]
},
@@ -3743,7 +3743,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "vofwl01vfw8ab3"
+ "property-value": "vocpel01vcpe8ab3"
}
]
},
@@ -3772,7 +3772,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01snkfbde"
+ "property-value": "democpel01snkfbde"
}
]
},
@@ -3801,7 +3801,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
+ "property-value": "Ete_vCPECLvCPESNK_7ba1fbde_0"
}
]
},
@@ -3830,7 +3830,7 @@
"related-to-property": [
{
"property-key": "vserver.vserver-name",
- "property-value": "demofwl01pgnfbde"
+ "property-value": "democpel01pgnfbde"
}
]
}