Sync logging context changes

Issue-ID: AAI-493
Change-Id: I8c460cce840b4fe46ff4deacbe3a770755a4c677
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

4 files changed, 104 insertions, 202 deletions

diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
index e7a4314..2ff66f8 100644
--- a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
@@ -1,187 +1,78 @@
 {
-    "description": "Named Query - For closed loop flow",
-    "named-query-elements": {
-        "named-query-element": [
-            {
-                "named-query-elements": {
-                    "named-query-element": [
-                        {
-                            "named-query-elements": {
-                                "named-query-element": [
-                                    {
-                                        "relationship-list": {
-                                            "relationship": [
-                                                {
-                                                    "related-to": "model",
-                                                    "relationship-data": [
-                                                        {
-                                                            "relationship-key": "model.model-invariant-id",
-                                                            "relationship-value": "425b2158-e51d-4509-9945-dad4556474a3"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            },
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "named-query-elements": {
-                                "named-query-element": [
-                                    {
-                                        "related-lookups": {
-                                            "related-lookup": [
-                                                {
-                                                    "property-collect-list": [
-                                                        "model-invariant-id",
-                                                        "model-type"
-                                                    ],
-                                                    "source-node-property": "model-invariant-id-local",
-                                                    "source-node-type": "vf-module",
-                                                    "target-node-property": "model-invariant-id",
-                                                    "target-node-type": "model"
-                                                },
-                                                {
-                                                    "property-collect-list": [
-                                                        "model-name",
-                                                        "model-version-id",
-                                                        "model-version"
-                                                    ],
-                                                    "source-node-property": "model-version-id-local",
-                                                    "source-node-type": "vf-module",
-                                                    "target-node-property": "model-version-id",
-                                                    "target-node-type": "model-ver"
-                                                }
-                                            ]
-                                        },
-                                        "relationship-list": {
-                                            "relationship": [
-                                                {
-                                                    "related-to": "model",
-                                                    "relationship-data": [
-                                                        {
-                                                            "relationship-key": "model.model-invariant-id",
-                                                            "relationship-value": "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    {
-                                        "related-lookups": {
-                                            "related-lookup": [
-                                                {
-                                                    "property-collect-list": [
-                                                        "model-invariant-id",
-                                                        "model-type"
-                                                    ],
-                                                    "source-node-property": "model-invariant-id-local",
-                                                    "source-node-type": "service-instance",
-                                                    "target-node-property": "model-invariant-id",
-                                                    "target-node-type": "model"
-                                                },
-                                                {
-                                                    "property-collect-list": [
-                                                        "model-name",
-                                                        "model-version-id",
-                                                        "model-version"
-                                                    ],
-                                                    "source-node-property": "model-version-id-local",
-                                                    "source-node-type": "service-instance",
-                                                    "target-node-property": "model-version-id",
-                                                    "target-node-type": "model-ver"
-                                                }
-                                            ]
-                                        },
-                                        "relationship-list": {
-                                            "relationship": [
-                                                {
-                                                    "related-to": "model",
-                                                    "relationship-data": [
-                                                        {
-                                                            "relationship-key": "model.model-invariant-id",
-                                                            "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4"
-                                                        }
-                                                    ]
-                                                }
-                                            ]
-                                        }
-                                    }
-                                ]
-                            },
-                            "related-lookups": {
-                                "related-lookup": [
-                                    {
-                                        "property-collect-list": [
-                                            "model-invariant-id",
-                                            "model-type"
-                                        ],
-                                        "source-node-property": "model-invariant-id-local",
-                                        "source-node-type": "generic-vnf",
-                                        "target-node-property": "model-invariant-id",
-                                        "target-node-type": "model"
-                                    },
-                                    {
-                                        "property-collect-list": [
-                                            "model-name",
-                                            "model-version-id",
-                                            "model-version"
-                                        ],
-                                        "source-node-property": "model-version-id-local",
-                                        "source-node-type": "generic-vnf",
-                                        "target-node-property": "model-version-id",
-                                        "target-node-type": "model-ver"
-                                    }
-                                ]
-                            },
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "acc6edd8-a8d4-4b93-afaa-0994068be14c"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "model",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "model.model-invariant-id",
-                                    "relationship-value": "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        ]
-    },
-    "named-query-name": "closed-loop-named-query",
-    "named-query-uuid": "4ff56a54-9e3f-46b7-a337-07a1d3c6b469",
-    "named-query-version": "1.0"
-}
+   "named-query-uuid" : "4ff56a54-9e3f-46b7-a337-07a1d3c6b469",
+   "named-query-name" : "closed-loop-named-query",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - For closed loop flow",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
\ No newline at end of file
diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getComponentList-1.1.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getComponentList-1.1.json
index 639cd41..f275950 100644
--- a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getComponentList-1.1.json
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getComponentList-1.1.json
@@ -8,6 +8,16 @@
          "property-collect-list" : [ "service-instance-id", "service-instance-name" ],
          "named-query-elements" : {
             "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "166c050d-f69d-4305-943e-0bc58c3a26cf"
+                     } ]
+                  } ]
+               }
+            }, {
                "named-query-elements" : {
                   "named-query-element" : [ {
                      "relationship-list" : {
@@ -122,4 +132,4 @@
          }
       } ]
    }
-}
+}
\ No newline at end of file
diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json
index 55b6a14..c371796 100644
--- a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json
@@ -42,20 +42,10 @@
                               "relationship-key" : "model.model-invariant-id",
                               "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
                            } ]
-                        }
-		     ] }
-		   },
-		   {
-                     "relationship-list" : {
-                        "relationship" : [ {
-                           "related-to" : "model",
-                           "relationship-data" : [ {
-                              "relationship-key" : "model.model-invariant-id",
-                              "relationship-value" : "96129eb9-f0de-4e05-8af2-73146473f766"
-                           } ]
-                        }
-		     ] }
-		 } ] },
+                        } ]
+                     }
+                  } ]
+               },
                "relationship-list" : {
                   "relationship" : [ {
                      "related-to" : "model",
@@ -78,4 +68,4 @@
          }
       } ]
    }
-}
+}
\ No newline at end of file
diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/widget-model-json/configuration-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/widget-model-json/configuration-1.0.json
new file mode 100644
index 0000000..939f175
--- /dev/null
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/widget-model-json/configuration-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "166c050d-f69d-4305-943e-0bc58c3a26cf",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "5a175add-57e4-4a5d-8b02-c36f1d69c52b",
+			"model-version" : "1.0",
+			"model-name" : "configuration"
+		} ]
+	}
+}