diff options
| author |   Norm Traxler <normant@amdocs.com> | 2019-01-21 21:03:59 +0000 |
|---|---|---|
| committer | Norm Traxler <normant@amdocs.com> | 2019-01-22 14:23:19 +0000 |
| commit | 5c07f0088fd71e30bfd8dc92b870f604b4297420 (patch) | |
| tree | 8f4fca51f25c591888b6dad00c6b94ee0db6a1ce /config | |
| parent | cdad28821c2ac6834e284aae72f10ad2d0529147 (diff) | |
NetworkDiscCtxBuilder error handling
Issue-ID: LOG-938
Change-Id: I20e8592efe5f1ca8960f228041303c8d25628018
Signed-off-by: Norm Traxler <normant@amdocs.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/jolt/sdToModelContextSpec.json (renamed from config/networkdiscovery.spec) | 2 | ||||
| -rw-r--r-- | config/jolt/sdToNdResourcesSpec.json | 43 | ||||
| -rw-r--r-- | config/ndQuery.spec | 34 |
3 files changed, 44 insertions, 35 deletions
diff --git a/config/networkdiscovery.spec b/config/jolt/sdToModelContextSpec.json index 2cc882c..88201a7 100644 --- a/config/networkdiscovery.spec +++ b/config/jolt/sdToModelContextSpec.json @@ -11,7 +11,7 @@ "*": { "vservers": { "*": { - "vserver-id": "vnfList[&3].vfModuleList[0].vmList[&1].uuid" + "vserver-id": "vnfList[&3].vfModuleList[0].vmList[&1].uuid" } }, "l3-networks": { diff --git a/config/jolt/sdToNdResourcesSpec.json b/config/jolt/sdToNdResourcesSpec.json new file mode 100644 index 0000000..c7d7496 --- /dev/null +++ b/config/jolt/sdToNdResourcesSpec.json @@ -0,0 +1,43 @@ +[
+ // Use https://jolt-demo.appspot.com/#inception to develop/test
+ // any changes to this file
+ {
+ // This section converts the updated json from service-decomposition
+ // to org.onap.pomba.contextbuilder.networkdiscovery.model.NdResources
+ "operation": "shift",
+ "spec": {
+ "generic-vnfs": {
+ "*": {
+ "vservers": {
+ "*": {
+ "vserver-id": {
+ "@": "tempResourceId",
+ "#vserver": "tempResourceType"
+
+ }
+ }},
+ "l3-networks": {
+ "*": {
+ "network-id": {
+ "@": "tempResourceId",
+ "#l3-network": "tempResourceType"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ {
+ "operation": "shift",
+ "spec": {
+ "tempResourceType": {
+ "*": {
+ "@": "ndResources[&].resourceType",
+ "@(2,tempResourceId[&])": "ndResources[&].resourceId"
+ }
+ }
+ }
+ }
+
+]
diff --git a/config/ndQuery.spec b/config/ndQuery.spec deleted file mode 100644 index d9248be..0000000 --- a/config/ndQuery.spec +++ /dev/null @@ -1,34 +0,0 @@ -[
- // Use https://jolt-demo.appspot.com/#inception to develop/test
- // any changes to this file
- {
- // This section converts the updated json from service-decomposition
- // to org.onap.pomba.contextbuilder.networkdiscovery.model.NdQuery
- "operation": "shift",
- "spec": {
- "generic-vnfs": {
- "*": {
- "vservers": {
- "*": {
- "vserver-id": "ndQuery[&3].ndResourcesList[0].ndResources[&1].resourceId",
- "#vserver": "ndQuery[&3].ndResourcesList[0].ndResources[&1].resourceType"
- }
- },
- "l3-networks": {
- "*": {
- "network-id": "ndQuery[&3].ndResourcesList[1].ndResources[&1].resourceId",
- "#l3-network": "ndQuery[&3].ndResourcesList[1].ndResources[&1].resourceType"
- }
- },
- "vnfcs": {
- "*": {
- "vnfc-id": "ndQuery[&3].ndResourcesList[2].ndResources[&1].resourceId",
- "#vnfc": "ndQuery[&3].ndResourcesList[2].ndResources[&1].resourceType"
- }
- }
- }
- }
- }
- }
-
- ]
|