4 files changed, 76 insertions, 69 deletions
diff --git a/config/application.properties b/config/application.properties
index b9b8601..af0ffa0 100644
--- a/config/application.properties
+++ b/config/application.properties
@@ -36,8 +36,8 @@ serviceDecomposition.password=OBF:1u2a1toa1w8v1tok1u30
 # Network Discovery Micro Service REST Client Configuration
 
 networkDiscoveryMicroService.host=10.147.112.148
-networkDiscoveryMicroService.port=8080
-networkDiscoveryMicroService.httpProtocol=http
+networkDiscoveryMicroService.port=8443
+networkDiscoveryMicroService.httpProtocol=https
 networkDiscoveryMicroService.networkDiscoveryPath=/network-discovery/v1/network/resource
 # Wait for Network Discovery MicroService response in milliseconds
 networkDiscoveryMicroService.responseTimeOutInMilliseconds=60000
diff --git a/config/jolt/sdToModelContextSpec.json b/config/jolt/sdToModelContextSpec.json
new file mode 100644
index 0000000..88201a7
--- /dev/null
+++ b/config/jolt/sdToModelContextSpec.json
@@ -0,0 +1,31 @@
+[
+  // 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": {
+      "service-instance-id": "service.uuid",
+      "generic-vnfs": {
+        "*": {
+          "vservers": {
+            "*": {
+              "vserver-id": "vnfList[&3].vfModuleList[0].vmList[&1].uuid"            
+            }
+          },
+          "l3-networks": {
+            "*": {
+              "network-id": "vnfList[&3].vfModuleList[0].networkList[&1].uuid"
+            }
+          },
+          "vnfcs": {
+            "*": {
+              "vnfc-id": "vnfList[&3].vnfcList[&1].uuid"
+            }
+          }
+        }
+      }
+    }
+    }
+  ]
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/networkdiscovery.spec b/config/networkdiscovery.spec
deleted file mode 100644
index 8da7a87..0000000
--- a/config/networkdiscovery.spec
+++ /dev/null
@@ -1,67 +0,0 @@
-[
-  // 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
-    "operation": "shift",
-    "spec": {
-      "service-instance-id": "service.uuid",
-      "generic-vnfs": {
-        "*": {
-          "vservers": {
-            "*": {
-              "vserver-id": "vfList[&3].vfModuleList[0].vmList[&1].uuid",
-              "nfNamingCode": "vfList[&3].vfModuleList[0].vmList[&1].nfNamingCode"
-            }
-          },
-          "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"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-  ]