Upgrade nd-context-builder to audit-common.1.4.0

Issue-ID: LOG-926
Change-Id: I63533764139d143bddbf3c2d3c3921dfd438d365
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>

2 files changed, 42 insertions, 44 deletions

diff --git a/config/ndQuery.spec b/config/ndQuery.spec
new file mode 100644
index 0000000..20914d2
--- /dev/null
+++ b/config/ndQuery.spec
@@ -0,0 +1,34 @@
+[

+  // Use https://jolt-demo.appspot.com/#inception to develop/test

+  // any changes to this file

+  {

+    // This section converts the updated json from service-decompostion

+    // to org.onap.pomba.common.datatypes.ModelContext

+    "operation": "shift",

+    "spec": {

+      "generic-vnfs": {

+        "*": {

+          "vservers": {

+            "*": {

+              "vserver-id": "ndQuery[&3].ndResourceList[0].ndResource[&1].resourceId",

+              "#vserver": "ndQuery[&3].ndResourceList[0].ndResource[&1].resourceType"

+            }

+          },

+          "l3-networks": {

+            "*": {

+              "network-id": "ndQuery[&3].ndResourceList[1].ndResource[&1].resourceId",

+              "#l3-network": "ndQuery[&3].ndResourceList[1].ndResource[&1].resourceType"

+            }

+          },

+          "vnfcs": {

+            "*": {

+              "vnfc-id": "ndQuery[&3].ndResourceList[2].ndResource[&1].resourceId",

+              "#vnfc": "ndQuery[&3].ndResourceList[2].ndResource[&1].resourceType"

+            }

+          }

+        }

+      }

+    }

+    }

+

+  ]

diff --git a/config/networkdiscovery.spec b/config/networkdiscovery.spec
index 8da7a87..2cc882c 100644
--- a/config/networkdiscovery.spec
+++ b/config/networkdiscovery.spec
@@ -1,39 +1,6 @@
 [
   // Use https://jolt-demo.appspot.com/#inception to develop/test
   // any changes to this file
-
-  {
-    // This sections adds nfNamingCode and dataQuality to the json
-    // fields returned from service-decomposition that we are
-    // interested in
-    "operation": "default",
-    "spec": {
-      "generic-vnfs[]": {
-        "*": {
-          "vf-modules": {
-            "vf-module[]": {
-              "*": {}
-            }
-          },
-          "vservers[]": {
-            "*": {
-              "nfNamingCode": "vserver"
-            }
-          },
-          "l3-networks[]": {
-            "*": {
-              "type": "l3-network"
-            }
-          },
-          "vnfcList[]": {
-            "*": {
-              "type": "vnfc"
-            }
-          }
-        }
-      }
-    }
-  },
   {
     // This section converts the updated json from service-decompostion
     // to org.onap.pomba.common.datatypes.ModelContext
@@ -44,24 +11,21 @@
         "*": {
           "vservers": {
             "*": {
-              "vserver-id": "vfList[&3].vfModuleList[0].vmList[&1].uuid",
-              "nfNamingCode": "vfList[&3].vfModuleList[0].vmList[&1].nfNamingCode"
+              "vserver-id": "vnfList[&3].vfModuleList[0].vmList[&1].uuid"
             }
           },
           "l3-networks": {
             "*": {
-              "network-id": "vfList[&3].vfModuleList[0].networkList[&1].uuid",
-              "type": "vfList[&3].vfModuleList[0].networkList[&1].type"
-            },
-            "vnfcs": {
-              "*": {
-                "vnfc-id": "vfList[&2].vnfcList[&1].uuid",
-                "type": "vfList[&2].vfModuleList[0].type"
-              }
+              "network-id": "vnfList[&3].vfModuleList[0].networkList[&1].uuid"
+            }
+          },
+          "vnfcs": {
+            "*": {
+              "vnfc-id": "vnfList[&3].vnfcList[&1].uuid"
             }
           }
         }
       }
     }
-  }
+    }
   ]