1 files changed, 93 insertions, 65 deletions
diff --git a/config/jolt/sdToNdResourcesSpec.json b/config/jolt/sdToNdResourcesSpec.json
index bce2d68..d0031f9 100644
--- a/config/jolt/sdToNdResourcesSpec.json
+++ b/config/jolt/sdToNdResourcesSpec.json
@@ -1,65 +1,93 @@
-[
-  // 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": {
-       "l3-networks": {
-         "*": {
-          "network-id": {
-            "@": "tempResourceId",
-            "#l3-network": "tempResourceType"
-          }
-        }
-      },
-      "generic-vnfs": {
-        "*": {
-          "vservers": {
-            "*": {
-              "vserver-id":  {
-                   "@": "tempResourceId",
-                   "#vserver": "tempResourceType"
-                    
-              }
-              }},
-          "vf-modules": {
-            "vf-module": {
-              "*": {
-                "l3-networks":  {
-                  "*": {
-                    "network-id": {
-                    "@": "tempResourceId",
-                    "#l3-network": "tempResourceType"
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "l3-networks": {
-            "*": {
-              "network-id": {
-                 "@": "tempResourceId",
-                 "#l3-network": "tempResourceType"
-              }
-            }
-          } 
-        }
-      }
-    }
-  },
-  {
-    "operation": "shift",
-    "spec": {
-      "tempResourceType": {
-        "*": {
-          "@": "ndResources[&].resourceType",
-          "@(2,tempResourceId[&])": "ndResources[&].resourceId"
-        }
-      }
-    }
-  }
-  
-]
+[
+  // 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": {
+      "l3-networks": {
+        "*": {
+          "network-id": {
+            "@": "tempResourceId",
+            "#l3-network": "tempResourceType"
+          }
+        }
+      },
+      "pnfs": {
+        "*": {
+          "p-interfaces": {
+            "p-interface": {
+              "*": {
+                "equipment-identifier": {
+                  "@": "tempResourceId",
+                  "#port": "tempResourceType"
+                }
+              }
+            }
+          }
+        }
+      },
+      "generic-vnfs": {
+        "*": {
+          "vservers": {
+            "*": {
+              "vserver-id": {
+                "@": "tempResourceId",
+                "#vserver": "tempResourceType"
+              }
+            }
+          },
+          "vf-modules": {
+            "vf-module": {
+              "*": {
+                "l3-networks": {
+                  "*": {
+                    "network-id": {
+                      "@": "tempResourceId",
+                      "#l3-network": "tempResourceType"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "l3-networks": {
+            "*": {
+              "network-id": {
+                "@": "tempResourceId",
+                "#l3-network": "tempResourceType"
+              }
+            }
+          },
+          "pservers": {
+            "*": {
+              "p-interfaces": {
+                "p-interface": {
+                  "*": {
+                    "equipment-identifier": {
+                      "@": "tempResourceId",
+                      "#port": "tempResourceType"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  {
+    "operation": "shift",
+    "spec": {
+      "tempResourceType": {
+        "*": {
+          "@": "ndResources[&].resourceType",
+          "@(2,tempResourceId[&])": "ndResources[&].resourceId"
+        }
+      }
+    }
+  }
+
+]