diff --git a/test/postman/01_Onboard_Vendor.postman_collection.json b/test/postman/01_Onboard_Vendor.postman_collection.json
index 17d23d3..31ce57b 100644
--- a/test/postman/01_Onboard_Vendor.postman_collection.json
+++ b/test/postman/01_Onboard_Vendor.postman_collection.json
@@ -1,363 +1,363 @@
 {
-	"info": {
-		"_postman_id": "338c7225-c4d5-40c8-8619-ae904f41a83d",
-		"name": "01_Onboard_Vendor",
-		"description": "onboard new vendor",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "Get Vendor before create",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "2249b072-2689-45f3-87ea-a75da5802752",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"var vendor_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i].name === pm.environment.get(\"vendor_name\")) {",
-							"       vendor_found = true;",
-							"       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i].id+\"\");",
-							"   }",
-							"}",
-							"if (vendor_found === false) {",
-							"    tests[pm.environment.get(\"vendor_name\")+\" not yet declared\"] = true;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"vendor_name\")+\" already exists, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-license-models"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Create Vendor",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "80c1d190-d480-4150-ae91-8ce4111c0f9d",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.itemId+\"\");",
-							"pm.environment.set(\"auto_vendor_version_id\", \"\"+jsonData.version.id+\"\");",
-							"",
-							"tests[\"Vendor status is : \"+jsonData.version.status] = jsonData.version.status === \"Draft\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n  \"iconRef\": \"icon\",\r\n  \"vendorName\": \"{{vendor_name}}\",\r\n  \"description\": \"Vendor\"\r\n}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-license-models"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Vendor after create",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "aa6fd7c5-c941-43ce-8300-a492c2d62a6c",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"var vendor_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i].name === pm.environment.get(\"vendor_name\")) {",
-							"       vendor_found = true;",
-							"       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i].id+\"\");",
-							"   }",
-							"}",
-							"tests[pm.environment.get(\"vendor_name\")+\" found\"] = vendor_found === vendor_found;",
-							"",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-license-models"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Submit Vendor",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "db905800-2754-491a-9d78-1ffebc12fb18",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"action\":\"Submit\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models/{{auto_vendor_id}}/versions/{{auto_vendor_version_id}}/actions",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-license-models",
-						"{{auto_vendor_id}}",
-						"versions",
-						"{{auto_vendor_version_id}}",
-						"actions"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Vendor additional info after Submit",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "f9003c80-add1-4581-9a9d-661972f7d6d5",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Vendor is : \"+jsonData.status] = jsonData.status === \"Certified\";",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vendor_id}}/versions/{{auto_vendor_version_id}}",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"items",
-						"{{auto_vendor_id}}",
-						"versions",
-						"{{auto_vendor_version_id}}"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "338c7225-c4d5-40c8-8619-ae904f41a83d",
+    "name": "01_Onboard_Vendor",
+    "description": "onboard new vendor",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "Get Vendor before create",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "2249b072-2689-45f3-87ea-a75da5802752",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "var vendor_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i].name === pm.environment.get(\"vendor_name\")) {",
+              "       vendor_found = true;",
+              "       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i].id+\"\");",
+              "   }",
+              "}",
+              "if (vendor_found === false) {",
+              "    tests[pm.environment.get(\"vendor_name\")+\" not yet declared\"] = true;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"vendor_name\")+\" already exists, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-license-models"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Create Vendor",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "80c1d190-d480-4150-ae91-8ce4111c0f9d",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.itemId+\"\");",
+              "pm.environment.set(\"auto_vendor_version_id\", \"\"+jsonData.version.id+\"\");",
+              "",
+              "tests[\"Vendor status is : \"+jsonData.version.status] = jsonData.version.status === \"Draft\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n  \"iconRef\": \"icon\",\r\n  \"vendorName\": \"{{vendor_name}}\",\r\n  \"description\": \"Vendor\"\r\n}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-license-models"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Vendor after create",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "aa6fd7c5-c941-43ce-8300-a492c2d62a6c",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "var vendor_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i].name === pm.environment.get(\"vendor_name\")) {",
+              "       vendor_found = true;",
+              "       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i].id+\"\");",
+              "   }",
+              "}",
+              "tests[pm.environment.get(\"vendor_name\")+\" found\"] = vendor_found === vendor_found;",
+              "",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-license-models"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Submit Vendor",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "db905800-2754-491a-9d78-1ffebc12fb18",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"action\":\"Submit\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models/{{auto_vendor_id}}/versions/{{auto_vendor_version_id}}/actions",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-license-models",
+            "{{auto_vendor_id}}",
+            "versions",
+            "{{auto_vendor_version_id}}",
+            "actions"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Vendor additional info after Submit",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "f9003c80-add1-4581-9a9d-661972f7d6d5",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Vendor is : \"+jsonData.status] = jsonData.status === \"Certified\";",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vendor_id}}/versions/{{auto_vendor_version_id}}",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "items",
+            "{{auto_vendor_id}}",
+            "versions",
+            "{{auto_vendor_version_id}}"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/02_Onboard_VSP_part1.postman_collection.json b/test/postman/02_Onboard_VSP_part1.postman_collection.json
index 0e46193..fc47bf3 100644
--- a/test/postman/02_Onboard_VSP_part1.postman_collection.json
+++ b/test/postman/02_Onboard_VSP_part1.postman_collection.json
@@ -1,424 +1,424 @@
 {
-	"info": {
-		"_postman_id": "7f61efa5-8b7f-4593-9d57-26da61bb8604",
-		"name": "02_Onboard_VSP_part1",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "check VSP exists",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "dc866867-2909-4844-9072-01c9e2e4e856",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vsp_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i].name === pm.environment.get(\"vsp_name\")) {",
-							"       vsp_found = true;",
-							"   }",
-							"}",
-							"",
-							"if (vsp_found === false) {",
-							"    tests[pm.environment.get(\"vsp_name\")+\" does not yet exist, we continue\"] = true;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"vsp_name\")+\" already exists, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Vendor infos",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "dbd0ea7f-5f66-4431-8a51-2e5d757647a0",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vendor_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i].name === pm.environment.get(\"vendor_name\")) {",
-							"       vendor_found = true;",
-							"       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i].id+\"\");",
-							"   }",
-							"}",
-							"if (vendor_found === false) {",
-							"    tests[pm.environment.get(\"vendor_name\")+\" does not exists : we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"vendor_name\")+\" exists\"] = true;",
-							"}",
-							"",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-license-models"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Create VSP",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "739f040c-f4b1-4790-bfce-4f5dae60b637",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_vsp_id\", \"\"+jsonData.itemId+\"\");",
-							"pm.environment.set(\"auto_vsp_version_id\", \"\"+jsonData.version.id+\"\");",
-							"pm.environment.set(\"auto_vsp_version_name\", \"\"+jsonData.version.name+\"\");",
-							"",
-							"tests[\"VSP version is : \"+jsonData.version.status] = jsonData.version.status === \"Draft\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n  \"name\": \"{{vsp_name}}\",\r\n  \"description\": \"vendor software product\",\r\n  \"icon\": \"icon\",\r\n  \"category\": \"resourceNewCategory.generic\",\r\n  \"subCategory\": \"resourceNewCategory.generic.abstract\",\r\n  \"vendorName\": \"{{vendor_name}}\",\r\n  \"vendorId\": \"{{auto_vendor_id}}\",\r\n  \"licensingData\": {},\r\n  \"onboardingMethod\": \"NetworkPackage\"\r\n}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products"
-					]
-				}
-			},
-			"response": [
-				{
-					"name": "Create Vendor Software Product",
-					"originalRequest": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": ""
-						}
-					},
-					"status": "OK",
-					"code": 200,
-					"_postman_previewlanguage": "json",
-					"header": [
-						{
-							"key": "access-control-allow-credentials",
-							"value": "true",
-							"name": "access-control-allow-credentials",
-							"description": "Indicates whether or not the response to the request can be exposed when the credentials flag is true. When used as part of a response to a preflight request, this indicates whether or not the actual request can be made using credentials."
-						},
-						{
-							"key": "access-control-allow-origin",
-							"value": "chrome-extension://fhbjgbiflinjbdggehcddcbncdddomop",
-							"name": "access-control-allow-origin",
-							"description": "Specifies a URI that may access the resource. For requests without credentials, the server may specify '*' as a wildcard, thereby allowing any origin to access the resource."
-						},
-						{
-							"key": "access-control-expose-headers",
-							"value": "",
-							"name": "access-control-expose-headers",
-							"description": "Lets a server whitelist headers that browsers are allowed to access."
-						},
-						{
-							"key": "content-type",
-							"value": "application/json",
-							"name": "content-type",
-							"description": "The mime type of this content"
-						},
-						{
-							"key": "date",
-							"value": "Wed, 06 Jun 2018 15:02:46 GMT",
-							"name": "date",
-							"description": "The date and time that the message was sent"
-						},
-						{
-							"key": "server",
-							"value": "Jetty(9.3.21.v20170918)",
-							"name": "server",
-							"description": "A name for the server"
-						},
-						{
-							"key": "transfer-encoding",
-							"value": "chunked",
-							"name": "transfer-encoding",
-							"description": "The form of encoding used to safely transfer the entity to the user. Currently defined methods are: chunked, compress, deflate, gzip, identity."
-						}
-					],
-					"cookie": [],
-					"body": "{\"vspId\":\"b3267b0aefbd4e2ea52be0e414139b1c\"}"
-				}
-			]
-		},
-		{
-			"name": "Get VSP versions",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "5e55115d-c797-4b34-bfaf-d2af24d62c01",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"items",
-						"{{auto_vsp_id}}",
-						"versions"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get VSP status",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "2492d06b-4b31-4d93-aaf2-3417419c6e14",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"items",
-						"{{auto_vsp_id}}",
-						"versions",
-						"{{auto_vsp_version_id}}"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "7f61efa5-8b7f-4593-9d57-26da61bb8604",
+    "name": "02_Onboard_VSP_part1",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "check VSP exists",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "dc866867-2909-4844-9072-01c9e2e4e856",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vsp_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i].name === pm.environment.get(\"vsp_name\")) {",
+              "       vsp_found = true;",
+              "   }",
+              "}",
+              "",
+              "if (vsp_found === false) {",
+              "    tests[pm.environment.get(\"vsp_name\")+\" does not yet exist, we continue\"] = true;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"vsp_name\")+\" already exists, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Vendor infos",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "dbd0ea7f-5f66-4431-8a51-2e5d757647a0",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vendor_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i].name === pm.environment.get(\"vendor_name\")) {",
+              "       vendor_found = true;",
+              "       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i].id+\"\");",
+              "   }",
+              "}",
+              "if (vendor_found === false) {",
+              "    tests[pm.environment.get(\"vendor_name\")+\" does not exists : we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"vendor_name\")+\" exists\"] = true;",
+              "}",
+              "",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-license-models"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Create VSP",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "739f040c-f4b1-4790-bfce-4f5dae60b637",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_vsp_id\", \"\"+jsonData.itemId+\"\");",
+              "pm.environment.set(\"auto_vsp_version_id\", \"\"+jsonData.version.id+\"\");",
+              "pm.environment.set(\"auto_vsp_version_name\", \"\"+jsonData.version.name+\"\");",
+              "",
+              "tests[\"VSP version is : \"+jsonData.version.status] = jsonData.version.status === \"Draft\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n  \"name\": \"{{vsp_name}}\",\r\n  \"description\": \"vendor software product\",\r\n  \"icon\": \"icon\",\r\n  \"category\": \"resourceNewCategory.generic\",\r\n  \"subCategory\": \"resourceNewCategory.generic.abstract\",\r\n  \"vendorName\": \"{{vendor_name}}\",\r\n  \"vendorId\": \"{{auto_vendor_id}}\",\r\n  \"licensingData\": {},\r\n  \"onboardingMethod\": \"NetworkPackage\"\r\n}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products"
+          ]
+        }
+      },
+      "response": [
+        {
+          "name": "Create Vendor Software Product",
+          "originalRequest": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": ""
+            }
+          },
+          "status": "OK",
+          "code": 200,
+          "_postman_previewlanguage": "json",
+          "header": [
+            {
+              "key": "access-control-allow-credentials",
+              "value": "true",
+              "name": "access-control-allow-credentials",
+              "description": "Indicates whether or not the response to the request can be exposed when the credentials flag is true. When used as part of a response to a preflight request, this indicates whether or not the actual request can be made using credentials."
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "chrome-extension://fhbjgbiflinjbdggehcddcbncdddomop",
+              "name": "access-control-allow-origin",
+              "description": "Specifies a URI that may access the resource. For requests without credentials, the server may specify '*' as a wildcard, thereby allowing any origin to access the resource."
+            },
+            {
+              "key": "access-control-expose-headers",
+              "value": "",
+              "name": "access-control-expose-headers",
+              "description": "Lets a server whitelist headers that browsers are allowed to access."
+            },
+            {
+              "key": "content-type",
+              "value": "application/json",
+              "name": "content-type",
+              "description": "The mime type of this content"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 06 Jun 2018 15:02:46 GMT",
+              "name": "date",
+              "description": "The date and time that the message was sent"
+            },
+            {
+              "key": "server",
+              "value": "Jetty(9.3.21.v20170918)",
+              "name": "server",
+              "description": "A name for the server"
+            },
+            {
+              "key": "transfer-encoding",
+              "value": "chunked",
+              "name": "transfer-encoding",
+              "description": "The form of encoding used to safely transfer the entity to the user. Currently defined methods are: chunked, compress, deflate, gzip, identity."
+            }
+          ],
+          "cookie": [],
+          "body": "{\"vspId\":\"b3267b0aefbd4e2ea52be0e414139b1c\"}"
+        }
+      ]
+    },
+    {
+      "name": "Get VSP versions",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "5e55115d-c797-4b34-bfaf-d2af24d62c01",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "items",
+            "{{auto_vsp_id}}",
+            "versions"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get VSP status",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "2492d06b-4b31-4d93-aaf2-3417419c6e14",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "items",
+            "{{auto_vsp_id}}",
+            "versions",
+            "{{auto_vsp_version_id}}"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/03_Onboard_VSP_part2.postman_collection.json b/test/postman/03_Onboard_VSP_part2.postman_collection.json
index d4b3a28..3102640 100644
--- a/test/postman/03_Onboard_VSP_part2.postman_collection.json
+++ b/test/postman/03_Onboard_VSP_part2.postman_collection.json
@@ -1,87 +1,87 @@
 {
-	"info": {
-		"_postman_id": "4779261e-f678-4383-b3a9-dfe63f080371",
-		"name": "03_Onboard_VSP_part2",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "Upload zip file containing Heat files",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "033f8cad-de66-4de9-8858-f3c72629c838",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"if (jsonData.status === \"Success\") {",
-							"    tests[\"Upload Success\"] = true;   ",
-							"}",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "multipart/form-data"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "formdata",
-					"formdata": [
-						{
-							"key": "upload",
-							"type": "file",
-							"src": ""
-						}
-					]
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/orchestration-template-candidate",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products",
-						"{{auto_vsp_id}}",
-						"versions",
-						"{{auto_vsp_version_id}}",
-						"orchestration-template-candidate"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "4779261e-f678-4383-b3a9-dfe63f080371",
+    "name": "03_Onboard_VSP_part2",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "Upload zip file containing Heat files",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "033f8cad-de66-4de9-8858-f3c72629c838",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "if (jsonData.status === \"Success\") {",
+              "    tests[\"Upload Success\"] = true;   ",
+              "}",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "multipart/form-data"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "formdata",
+          "formdata": [
+            {
+              "key": "upload",
+              "type": "file",
+              "src": ""
+            }
+          ]
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/orchestration-template-candidate",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products",
+            "{{auto_vsp_id}}",
+            "versions",
+            "{{auto_vsp_version_id}}",
+            "orchestration-template-candidate"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/04_Onboard_VSP_part3.postman_collection.json b/test/postman/04_Onboard_VSP_part3.postman_collection.json
index 3f65148..01de8b7 100644
--- a/test/postman/04_Onboard_VSP_part3.postman_collection.json
+++ b/test/postman/04_Onboard_VSP_part3.postman_collection.json
@@ -1,398 +1,398 @@
 {
-	"info": {
-		"_postman_id": "458aefd8-1c13-4d22-859b-38757f935cca",
-		"name": "04_Onboard_VSP_part3",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "Process VSP zip file",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "1dceb509-a7e0-426f-b6fc-c50e9e9376e3",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/orchestration-template-candidate/process",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products",
-						"{{auto_vsp_id}}",
-						"versions",
-						"{{auto_vsp_version_id}}",
-						"orchestration-template-candidate",
-						"process"
-					]
-				}
-			},
-			"response": [
-				{
-					"name": "Checkin VSP",
-					"originalRequest": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": ""
-						}
-					},
-					"status": "OK",
-					"code": 200,
-					"_postman_previewlanguage": "json",
-					"header": [
-						{
-							"key": "access-control-allow-credentials",
-							"value": "true",
-							"name": "access-control-allow-credentials",
-							"description": "Indicates whether or not the response to the request can be exposed when the credentials flag is true. When used as part of a response to a preflight request, this indicates whether or not the actual request can be made using credentials."
-						},
-						{
-							"key": "access-control-allow-origin",
-							"value": "chrome-extension://fhbjgbiflinjbdggehcddcbncdddomop",
-							"name": "access-control-allow-origin",
-							"description": "Specifies a URI that may access the resource. For requests without credentials, the server may specify '*' as a wildcard, thereby allowing any origin to access the resource."
-						},
-						{
-							"key": "access-control-expose-headers",
-							"value": "",
-							"name": "access-control-expose-headers",
-							"description": "Lets a server whitelist headers that browsers are allowed to access."
-						},
-						{
-							"key": "content-type",
-							"value": "application/json",
-							"name": "content-type",
-							"description": "The mime type of this content"
-						},
-						{
-							"key": "date",
-							"value": "Wed, 06 Jun 2018 16:14:24 GMT",
-							"name": "date",
-							"description": "The date and time that the message was sent"
-						},
-						{
-							"key": "server",
-							"value": "Jetty(9.3.21.v20170918)",
-							"name": "server",
-							"description": "A name for the server"
-						},
-						{
-							"key": "transfer-encoding",
-							"value": "chunked",
-							"name": "transfer-encoding",
-							"description": "The form of encoding used to safely transfer the entity to the user. Currently defined methods are: chunked, compress, deflate, gzip, identity."
-						}
-					],
-					"cookie": [],
-					"body": "{}"
-				}
-			]
-		},
-		{
-			"name": "Commit VSP",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "0f0417e6-2b03-44a4-9416-9f709077a525",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"action\":\"Commit\",\"commitRequest\":{\"message\":\"ok\"}}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/actions",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"items",
-						"{{auto_vsp_id}}",
-						"versions",
-						"{{auto_vsp_version_id}}",
-						"actions"
-					]
-				}
-			},
-			"response": [
-				{
-					"name": "Checkin VSP",
-					"originalRequest": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": ""
-						}
-					},
-					"status": "OK",
-					"code": 200,
-					"_postman_previewlanguage": "json",
-					"header": [
-						{
-							"key": "access-control-allow-credentials",
-							"value": "true",
-							"name": "access-control-allow-credentials",
-							"description": "Indicates whether or not the response to the request can be exposed when the credentials flag is true. When used as part of a response to a preflight request, this indicates whether or not the actual request can be made using credentials."
-						},
-						{
-							"key": "access-control-allow-origin",
-							"value": "chrome-extension://fhbjgbiflinjbdggehcddcbncdddomop",
-							"name": "access-control-allow-origin",
-							"description": "Specifies a URI that may access the resource. For requests without credentials, the server may specify '*' as a wildcard, thereby allowing any origin to access the resource."
-						},
-						{
-							"key": "access-control-expose-headers",
-							"value": "",
-							"name": "access-control-expose-headers",
-							"description": "Lets a server whitelist headers that browsers are allowed to access."
-						},
-						{
-							"key": "content-type",
-							"value": "application/json",
-							"name": "content-type",
-							"description": "The mime type of this content"
-						},
-						{
-							"key": "date",
-							"value": "Wed, 06 Jun 2018 16:14:24 GMT",
-							"name": "date",
-							"description": "The date and time that the message was sent"
-						},
-						{
-							"key": "server",
-							"value": "Jetty(9.3.21.v20170918)",
-							"name": "server",
-							"description": "A name for the server"
-						},
-						{
-							"key": "transfer-encoding",
-							"value": "chunked",
-							"name": "transfer-encoding",
-							"description": "The form of encoding used to safely transfer the entity to the user. Currently defined methods are: chunked, compress, deflate, gzip, identity."
-						}
-					],
-					"cookie": [],
-					"body": "{}"
-				}
-			]
-		},
-		{
-			"name": "Submit VSP",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "78d1f69f-e8aa-47aa-a456-45496847ace4",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"action\": \"Submit\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/actions",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products",
-						"{{auto_vsp_id}}",
-						"versions",
-						"{{auto_vsp_version_id}}",
-						"actions"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "CSAR VSP",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "5900576b-42d4-4b68-ae67-770e76e6ba97",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"action\": \"Create_Package\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/actions",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products",
-						"{{auto_vsp_id}}",
-						"versions",
-						"{{auto_vsp_version_id}}",
-						"actions"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "458aefd8-1c13-4d22-859b-38757f935cca",
+    "name": "04_Onboard_VSP_part3",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "Process VSP zip file",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "1dceb509-a7e0-426f-b6fc-c50e9e9376e3",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/orchestration-template-candidate/process",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products",
+            "{{auto_vsp_id}}",
+            "versions",
+            "{{auto_vsp_version_id}}",
+            "orchestration-template-candidate",
+            "process"
+          ]
+        }
+      },
+      "response": [
+        {
+          "name": "Checkin VSP",
+          "originalRequest": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": ""
+            }
+          },
+          "status": "OK",
+          "code": 200,
+          "_postman_previewlanguage": "json",
+          "header": [
+            {
+              "key": "access-control-allow-credentials",
+              "value": "true",
+              "name": "access-control-allow-credentials",
+              "description": "Indicates whether or not the response to the request can be exposed when the credentials flag is true. When used as part of a response to a preflight request, this indicates whether or not the actual request can be made using credentials."
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "chrome-extension://fhbjgbiflinjbdggehcddcbncdddomop",
+              "name": "access-control-allow-origin",
+              "description": "Specifies a URI that may access the resource. For requests without credentials, the server may specify '*' as a wildcard, thereby allowing any origin to access the resource."
+            },
+            {
+              "key": "access-control-expose-headers",
+              "value": "",
+              "name": "access-control-expose-headers",
+              "description": "Lets a server whitelist headers that browsers are allowed to access."
+            },
+            {
+              "key": "content-type",
+              "value": "application/json",
+              "name": "content-type",
+              "description": "The mime type of this content"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 06 Jun 2018 16:14:24 GMT",
+              "name": "date",
+              "description": "The date and time that the message was sent"
+            },
+            {
+              "key": "server",
+              "value": "Jetty(9.3.21.v20170918)",
+              "name": "server",
+              "description": "A name for the server"
+            },
+            {
+              "key": "transfer-encoding",
+              "value": "chunked",
+              "name": "transfer-encoding",
+              "description": "The form of encoding used to safely transfer the entity to the user. Currently defined methods are: chunked, compress, deflate, gzip, identity."
+            }
+          ],
+          "cookie": [],
+          "body": "{}"
+        }
+      ]
+    },
+    {
+      "name": "Commit VSP",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "0f0417e6-2b03-44a4-9416-9f709077a525",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"action\":\"Commit\",\"commitRequest\":{\"message\":\"ok\"}}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/actions",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "items",
+            "{{auto_vsp_id}}",
+            "versions",
+            "{{auto_vsp_version_id}}",
+            "actions"
+          ]
+        }
+      },
+      "response": [
+        {
+          "name": "Checkin VSP",
+          "originalRequest": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": ""
+            }
+          },
+          "status": "OK",
+          "code": 200,
+          "_postman_previewlanguage": "json",
+          "header": [
+            {
+              "key": "access-control-allow-credentials",
+              "value": "true",
+              "name": "access-control-allow-credentials",
+              "description": "Indicates whether or not the response to the request can be exposed when the credentials flag is true. When used as part of a response to a preflight request, this indicates whether or not the actual request can be made using credentials."
+            },
+            {
+              "key": "access-control-allow-origin",
+              "value": "chrome-extension://fhbjgbiflinjbdggehcddcbncdddomop",
+              "name": "access-control-allow-origin",
+              "description": "Specifies a URI that may access the resource. For requests without credentials, the server may specify '*' as a wildcard, thereby allowing any origin to access the resource."
+            },
+            {
+              "key": "access-control-expose-headers",
+              "value": "",
+              "name": "access-control-expose-headers",
+              "description": "Lets a server whitelist headers that browsers are allowed to access."
+            },
+            {
+              "key": "content-type",
+              "value": "application/json",
+              "name": "content-type",
+              "description": "The mime type of this content"
+            },
+            {
+              "key": "date",
+              "value": "Wed, 06 Jun 2018 16:14:24 GMT",
+              "name": "date",
+              "description": "The date and time that the message was sent"
+            },
+            {
+              "key": "server",
+              "value": "Jetty(9.3.21.v20170918)",
+              "name": "server",
+              "description": "A name for the server"
+            },
+            {
+              "key": "transfer-encoding",
+              "value": "chunked",
+              "name": "transfer-encoding",
+              "description": "The form of encoding used to safely transfer the entity to the user. Currently defined methods are: chunked, compress, deflate, gzip, identity."
+            }
+          ],
+          "cookie": [],
+          "body": "{}"
+        }
+      ]
+    },
+    {
+      "name": "Submit VSP",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "78d1f69f-e8aa-47aa-a456-45496847ace4",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"action\": \"Submit\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/actions",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products",
+            "{{auto_vsp_id}}",
+            "versions",
+            "{{auto_vsp_version_id}}",
+            "actions"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "CSAR VSP",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "5900576b-42d4-4b68-ae67-770e76e6ba97",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"action\": \"Create_Package\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products/{{auto_vsp_id}}/versions/{{auto_vsp_version_id}}/actions",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products",
+            "{{auto_vsp_id}}",
+            "versions",
+            "{{auto_vsp_version_id}}",
+            "actions"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/05_Onboard_VF.postman_collection.json b/test/postman/05_Onboard_VF.postman_collection.json
index 50ae5f8..1662e6f 100644
--- a/test/postman/05_Onboard_VF.postman_collection.json
+++ b/test/postman/05_Onboard_VF.postman_collection.json
@@ -1,632 +1,632 @@
 {
-	"info": {
-		"_postman_id": "8f0c4ff0-c762-4289-8547-daa0def307c1",
-		"name": "05_Onboard_VF",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "check vf exists and get id",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "a7d64193-edcb-4540-bcac-dde0f33a637f",
-						"exec": [
-							"",
-							"var vf_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"vf_name\")+\" does not exists\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"        }",
-							"    var jsonData = pm.response.json();",
-							"    for (var i = 0; i < jsonData.length; i++) { ",
-							"       if (jsonData[i].name === pm.environment.get(\"vf_name\")) {",
-							"           vf_found = true;",
-							"           pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData[i].uuid+\"\");",
-							"           pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
-							"       }",
-							"    }",
-							"    if (vf_found === false) {",
-							"        tests[pm.environment.get(\"vf_name\")+\" does not yet exists, we continue the run\"] = true;",
-							"    }",
-							"    ",
-							"    else {",
-							"        tests[pm.environment.get(\"vf_name\")+\" already exists, stop the run\"] = false;",
-							"        postman.setNextRequest(null);",
-							"    }",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/resources?resourceType=VF",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"resources"
-					],
-					"query": [
-						{
-							"key": "resourceType",
-							"value": "VF"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check VSP exists and get infos",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ff2f00ca-80fc-40d6-b6ec-aac08eb91759",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vsp_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i].name === pm.environment.get(\"vsp_name\")) {",
-							"       vsp_found = true;",
-							"       pm.environment.set(\"auto_vsp_id\", \"\"+jsonData.results[i].id+\"\");",
-							"",
-							"   }",
-							"}",
-							"if (vsp_found === false) {",
-							"    tests[\"VSP \"+pm.environment.get(\"vsp_name\")+\" does not exists, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);    ",
-							"}",
-							"",
-							"else {",
-							"    tests[\"VSP \"+pm.environment.get(\"vsp_name\")+\" exists, we can continue\"] = true;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-software-products"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get VSP versions",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "f16c158f-aceb-490c-924d-3ea83c2b9431",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vsp_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i].name === pm.environment.get(\"vsp_name\")) {",
-							"       vsp_found = true;",
-							"       pm.environment.set(\"auto_vsp_version_id\", \"\"+jsonData.results[i].id+\"\");",
-							"       pm.environment.set(\"auto_vsp_version_name\", \"\"+jsonData.results[i].name+\"\");",
-							"   }",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"items",
-						"{{auto_vsp_id}}",
-						"versions"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Vendor infos",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ed512660-e7af-450f-aa7e-b503c7e21a72",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vendor_found = false;",
-							"for (var i = 0; i < jsonData.results.length; i++) { ",
-							"   if (jsonData.results[i][\"name\"] === pm.environment.get(\"vendor_name\")) {",
-							"       vendor_found = true;",
-							"       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i][\"id\"]+\"\");",
-							"   }",
-							"}",
-							"if (vendor_found === false) {",
-							"    tests[pm.environment.get(\"vendor_name\")+\" does not exists : we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"vendor_name\")+\" exists\"] = true;",
-							"}",
-							"",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "robot-ete"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"onboarding-api",
-						"v1.0",
-						"vendor-license-models"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Create VF resource",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "78a4913a-db8c-4c41-8fae-28e5bf6d90b4",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData.invariantUUID+\"\");",
-							"pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData.uuid+\"\");",
-							"pm.environment.set(\"auto_vf_unique_id\", \"\"+jsonData.uniqueId+\"\");",
-							"",
-							"tests[\"VF status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKOUT\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\t\"artifacts\": {},\r\n\t\"toscaArtifacts\": {},\r\n\t\"contactId\": \"cs0008\",\r\n\t\"categories\": [{\r\n\t\t\"name\": \"Generic\",\r\n\t\t\"normalizedName\": \"generic\",\r\n\t\t\"uniqueId\": \"resourceNewCategory.generic\",\r\n\t\t\"icons\": null,\r\n\t\t\"subcategories\": [{\r\n\t\t\t\"name\": \"Abstract\",\r\n\t\t\t\"normalizedName\": \"abstract\",\r\n\t\t\t\"uniqueId\": \"resourceNewCategory.generic.abstract\",\r\n\t\t\t\"icons\": [\"objectStorage\", \"compute\"],\r\n\t\t\t\"groupings\": null,\r\n\t\t\t\"ownerId\": null,\r\n\t\t\t\"empty\": false\r\n\t\t}],\r\n\t\t\"ownerId\": null,\r\n\t\t\"empty\": false\r\n\t}],\r\n\t\"description\": \"VF named {{vf_name}}\",\r\n\t\"icon\": \"defaulticon\",\r\n\t\"componentInstancesProperties\": {},\r\n\t\"componentInstancesAttributes\": {},\r\n\t\"name\": \"{{vf_name}}\",\r\n\t\"tags\": [\"{{vf_name}}\"],\r\n\t\"capabilities\": {},\r\n\t\"requirements\": {},\r\n\t\"deploymentArtifacts\": {},\r\n\t\"componentType\": \"RESOURCE\",\r\n\t\"vendorName\": \"{{vendor_name}}\",\r\n\t\"vendorRelease\": \"1.0\",\r\n\t\"componentInstances\": [],\r\n\t\"properties\": [],\r\n\t\"attributes\": [],\r\n\t\"groups\": [],\r\n\t\"resourceType\": \"VF\",\r\n\t\"csarUUID\": \"{{auto_vsp_id}}\",\r\n\t\"csarVersion\": \"{{auto_vsp_version_name}}\"\r\n}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/resources",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"resources"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Checkin VF resource",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"VF status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKIN\";"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "X-ECOMP-InstanceID",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\": \"ONAP-Test checkin\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/resources/{{auto_vf_uuid}}/lifecycleState/checkin",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"resources",
-						"{{auto_vf_uuid}}",
-						"lifecycleState",
-						"checkin"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Certify VF resource",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"type": "text/javascript",
-						"exec": [
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"VF status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFIED\";"
-						]
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "X-ECOMP-InstanceID",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\": \"certify\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/resources/{{auto_vf_unique_id}}/lifecycleState/certify",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"resources",
-						"{{auto_vf_unique_id}}",
-						"lifecycleState",
-						"certify"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get VF infos by uniqueId to get new vf_unique_Id (=new version id)",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "8d831aa8-7760-44b4-aab4-da4724e8dfc9",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_vf_new_unique_id\", \"\"+jsonData[\"metadata\"][\"allVersions\"][\"1.0\"]+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/resources/{{auto_vf_unique_id}}/filteredDataByParams?include=metadata",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"resources",
-						"{{auto_vf_unique_id}}",
-						"filteredDataByParams"
-					],
-					"query": [
-						{
-							"key": "include",
-							"value": "metadata"
-						}
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "8f0c4ff0-c762-4289-8547-daa0def307c1",
+    "name": "05_Onboard_VF",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "check vf exists and get id",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "a7d64193-edcb-4540-bcac-dde0f33a637f",
+            "exec": [
+              "",
+              "var vf_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"vf_name\")+\" does not exists\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "        }",
+              "    var jsonData = pm.response.json();",
+              "    for (var i = 0; i < jsonData.length; i++) { ",
+              "       if (jsonData[i].name === pm.environment.get(\"vf_name\")) {",
+              "           vf_found = true;",
+              "           pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData[i].uuid+\"\");",
+              "           pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
+              "       }",
+              "    }",
+              "    if (vf_found === false) {",
+              "        tests[pm.environment.get(\"vf_name\")+\" does not yet exists, we continue the run\"] = true;",
+              "    }",
+              "    ",
+              "    else {",
+              "        tests[pm.environment.get(\"vf_name\")+\" already exists, stop the run\"] = false;",
+              "        postman.setNextRequest(null);",
+              "    }",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/resources?resourceType=VF",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "resources"
+          ],
+          "query": [
+            {
+              "key": "resourceType",
+              "value": "VF"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check VSP exists and get infos",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ff2f00ca-80fc-40d6-b6ec-aac08eb91759",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vsp_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i].name === pm.environment.get(\"vsp_name\")) {",
+              "       vsp_found = true;",
+              "       pm.environment.set(\"auto_vsp_id\", \"\"+jsonData.results[i].id+\"\");",
+              "",
+              "   }",
+              "}",
+              "if (vsp_found === false) {",
+              "    tests[\"VSP \"+pm.environment.get(\"vsp_name\")+\" does not exists, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);    ",
+              "}",
+              "",
+              "else {",
+              "    tests[\"VSP \"+pm.environment.get(\"vsp_name\")+\" exists, we can continue\"] = true;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-software-products",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-software-products"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get VSP versions",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "f16c158f-aceb-490c-924d-3ea83c2b9431",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vsp_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i].name === pm.environment.get(\"vsp_name\")) {",
+              "       vsp_found = true;",
+              "       pm.environment.set(\"auto_vsp_version_id\", \"\"+jsonData.results[i].id+\"\");",
+              "       pm.environment.set(\"auto_vsp_version_name\", \"\"+jsonData.results[i].name+\"\");",
+              "   }",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/items/{{auto_vsp_id}}/versions",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "items",
+            "{{auto_vsp_id}}",
+            "versions"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Vendor infos",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ed512660-e7af-450f-aa7e-b503c7e21a72",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vendor_found = false;",
+              "for (var i = 0; i < jsonData.results.length; i++) { ",
+              "   if (jsonData.results[i][\"name\"] === pm.environment.get(\"vendor_name\")) {",
+              "       vendor_found = true;",
+              "       pm.environment.set(\"auto_vendor_id\", \"\"+jsonData.results[i][\"id\"]+\"\");",
+              "   }",
+              "}",
+              "if (vendor_found === false) {",
+              "    tests[pm.environment.get(\"vendor_name\")+\" does not exists : we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"vendor_name\")+\" exists\"] = true;",
+              "}",
+              "",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "robot-ete-ba84612d-c1c6-4c53-9967-7b1dff276c7a"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "robot-ete"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/onboarding-api/v1.0/vendor-license-models",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "onboarding-api",
+            "v1.0",
+            "vendor-license-models"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Create VF resource",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "78a4913a-db8c-4c41-8fae-28e5bf6d90b4",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData.invariantUUID+\"\");",
+              "pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData.uuid+\"\");",
+              "pm.environment.set(\"auto_vf_unique_id\", \"\"+jsonData.uniqueId+\"\");",
+              "",
+              "tests[\"VF status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKOUT\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\t\"artifacts\": {},\r\n\t\"toscaArtifacts\": {},\r\n\t\"contactId\": \"cs0008\",\r\n\t\"categories\": [{\r\n\t\t\"name\": \"Generic\",\r\n\t\t\"normalizedName\": \"generic\",\r\n\t\t\"uniqueId\": \"resourceNewCategory.generic\",\r\n\t\t\"icons\": null,\r\n\t\t\"subcategories\": [{\r\n\t\t\t\"name\": \"Abstract\",\r\n\t\t\t\"normalizedName\": \"abstract\",\r\n\t\t\t\"uniqueId\": \"resourceNewCategory.generic.abstract\",\r\n\t\t\t\"icons\": [\"objectStorage\", \"compute\"],\r\n\t\t\t\"groupings\": null,\r\n\t\t\t\"ownerId\": null,\r\n\t\t\t\"empty\": false\r\n\t\t}],\r\n\t\t\"ownerId\": null,\r\n\t\t\"empty\": false\r\n\t}],\r\n\t\"description\": \"VF named {{vf_name}}\",\r\n\t\"icon\": \"defaulticon\",\r\n\t\"componentInstancesProperties\": {},\r\n\t\"componentInstancesAttributes\": {},\r\n\t\"name\": \"{{vf_name}}\",\r\n\t\"tags\": [\"{{vf_name}}\"],\r\n\t\"capabilities\": {},\r\n\t\"requirements\": {},\r\n\t\"deploymentArtifacts\": {},\r\n\t\"componentType\": \"RESOURCE\",\r\n\t\"vendorName\": \"{{vendor_name}}\",\r\n\t\"vendorRelease\": \"1.0\",\r\n\t\"componentInstances\": [],\r\n\t\"properties\": [],\r\n\t\"attributes\": [],\r\n\t\"groups\": [],\r\n\t\"resourceType\": \"VF\",\r\n\t\"csarUUID\": \"{{auto_vsp_id}}\",\r\n\t\"csarVersion\": \"{{auto_vsp_version_name}}\"\r\n}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/resources",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "resources"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Checkin VF resource",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"VF status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKIN\";"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "X-ECOMP-InstanceID",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\": \"ONAP-Test checkin\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/resources/{{auto_vf_uuid}}/lifecycleState/checkin",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "resources",
+            "{{auto_vf_uuid}}",
+            "lifecycleState",
+            "checkin"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Certify VF resource",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "type": "text/javascript",
+            "exec": [
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"VF status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFIED\";"
+            ]
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "X-ECOMP-InstanceID",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\": \"certify\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/resources/{{auto_vf_unique_id}}/lifecycleState/certify",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "resources",
+            "{{auto_vf_unique_id}}",
+            "lifecycleState",
+            "certify"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get VF infos by uniqueId to get new vf_unique_Id (=new version id)",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "8d831aa8-7760-44b4-aab4-da4724e8dfc9",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_vf_new_unique_id\", \"\"+jsonData[\"metadata\"][\"allVersions\"][\"1.0\"]+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/resources/{{auto_vf_unique_id}}/filteredDataByParams?include=metadata",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "resources",
+            "{{auto_vf_unique_id}}",
+            "filteredDataByParams"
+          ],
+          "query": [
+            {
+              "key": "include",
+              "value": "metadata"
+            }
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/06_Onboard_Service.postman_collection.json b/test/postman/06_Onboard_Service.postman_collection.json
index eb4724c..f515a2a 100644
--- a/test/postman/06_Onboard_Service.postman_collection.json
+++ b/test/postman/06_Onboard_Service.postman_collection.json
@@ -1,1410 +1,1410 @@
 {
-	"info": {
-		"_postman_id": "dcfc4671-1cb4-453a-8fef-97a0ba533daa",
-		"name": "06_Onboard_Service",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "check  service exists and get infos",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "4f27b99e-23ac-4e7c-a1dc-c42ad63d6f65",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var service_found = false;",
-							"for (var i = 0; i < jsonData.length; i++) { ",
-							"   if (jsonData[i].name === pm.environment.get(\"service\")) {",
-							"       service_found = true;",
-							"       pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[i].uuid+\"\");",
-							"       pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
-							"   }",
-							"}",
-							"if (service_found === false) {",
-							"    tests[pm.environment.get(\"service\")+\" does not exist yet, we continue the run\"] = true;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" already exists, stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/services",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare an aLaCarte Service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e6118e78-e476-4049-8e81-f81b53ba625a",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[\"invariantUUID\"]+\"\");",
-							"pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[\"uuid\"]+\"\");",
-							"pm.environment.set(\"auto_service_unique_id\", \"\"+jsonData[\"uniqueId\"]+\"\");",
-							"",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKOUT\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\t\"artifacts\": {},\r\n\t\"toscaArtifacts\": {},\r\n\t\"contactId\": \"cs0008\",\r\n\t\"categories\": [{\r\n\t\t\"name\": \"Network Service\",\r\n\t\t\"normalizedName\": \"network service\",\r\n\t\t\"uniqueId\": \"serviceNewCategory.network service\",\r\n\t\t\"icons\": [\"network_l_1-3\"],\r\n\t\t\"subcategories\": null,\r\n\t\t\"version\": null,\r\n\t\t\"ownerId\": null,\r\n\t\t\"empty\": false,\r\n\t\t\"type\": null\r\n\t}],\r\n\t\"description\": \"Service {{service}}\",\r\n\t\"icon\": \"defaulticon\",\r\n\t\"componentInstancesProperties\": {},\r\n\t\"componentInstancesAttributes\": {},\r\n\t\"name\": \"{{service}}\",\r\n\t\"tags\": [\"{{service}}\"],\r\n\t\"capabilities\": {},\r\n\t\"requirements\": {},\r\n\t\"deploymentArtifacts\": {},\r\n\t\"componentType\": \"SERVICE\",\r\n\t\"projectCode\": \"123456\",\r\n\t\"componentInstances\": [],\r\n\t\"properties\": [],\r\n\t\"attributes\": [],\r\n\t\"forwardingPaths\": {},\r\n\t\"ecompGeneratedNaming\": true,\r\n\t\"serviceApiArtifacts\": {},\r\n\t\"instantiationType\": \"A-la-carte\",\r\n\t\"environmentContext\": \"General_Revenue-Bearing\"\r\n}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check VF exists and get uuid",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "87b90661-aefb-4ec9-94fc-fb5277f8c283",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vf_found = false;",
-							"if (jsonData.name === pm.environment.get(\"vf_name\")) {",
-							"    vf_found = true;",
-							"    pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData.uuid+\"\");",
-							"    pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData.invariantUUID+\"\");",
-							"    ",
-							"}",
-							"",
-							"if (vf_found === false) {",
-							"    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" does not exists, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"",
-							"}",
-							"",
-							"else {",
-							"    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" exists, we continue the run\"] = true;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/resources/{{auto_vf_uuid}}/metadata",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"resources",
-						"{{auto_vf_uuid}}",
-						"metadata"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get  VF uniqueId",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "16c73747-c973-40d9-ba3f-6061199386ec",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var vf_found = false;",
-							"for (var i = 0; i < jsonData.resources.length; i++) { ",
-							"   if (jsonData.resources[i].name === pm.environment.get(\"vf_name\")) {",
-							"       vf_found = true;",
-							"       pm.environment.set(\"auto_vf_unique_id\", \"\"+jsonData.resources[i].uniqueId+\"\");",
-							"   }",
-							"}",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/screen?excludeTypes=VFCMT&excludeTypes=Configuration",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"screen"
-					],
-					"query": [
-						{
-							"key": "excludeTypes",
-							"value": "VFCMT"
-						},
-						{
-							"key": "excludeTypes",
-							"value": "Configuration"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add VF to Service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "897b4588-b2e6-4af6-b469-09ae6ea3b797",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_vf_customization_uuid\", \"\"+jsonData.customizationUUID+\"\");",
-							"pm.environment.set(\"auto_vf_name_for_model\", \"\"+jsonData.name+\"\");",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\t\"name\": \"{{vf_name}}\",\r\n\t\"componentVersion\": \"1.0\",\r\n\t\"posY\": 100,\r\n\t\"posX\": 200,\r\n\t\"uniqueId\": \"{{auto_vf_unique_id}}\",\r\n\t\"originType\": \"VF\",\r\n\t\"componentUid\": \"{{auto_vf_unique_id}}\",\r\n\t\"icon\": \"defaulticon\"\r\n}\r\n"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/resourceInstance",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"resourceInstance"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Generic Neutron Virtual Link infos",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "8bc90be4-f039-44cb-af75-7f3addd63bdd",
-						"exec": [
-							"var vl_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"virtual_link_type\")+\" does not exists\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"    var jsonData = pm.response.json();",
-							"    for (var i = 0; i < jsonData.length; i++) { ",
-							"       if (jsonData[i].name === pm.environment.get(\"virtual_link_type\")) {",
-							"           vl_found = true;",
-							"           pm.environment.set(\"auto_virtual_link_uuid\", \"\"+jsonData[i].uuid+\"\");",
-							"           pm.environment.set(\"auto_virtual_link_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
-							"       }",
-							"    }",
-							"    if (vl_found === false) {",
-							"        tests[pm.environment.get(\"virtual_link_type\")+\" does not exists, we stop the run\"] = false;",
-							"        postman.setNextRequest(null);",
-							"    }",
-							"    ",
-							"    else {",
-							"        tests[pm.environment.get(\"virtual_link_type\")+\" exists, we continue the run\"] = true;",
-							"    }",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/resources?resourceType=VL",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"resources"
-					],
-					"query": [
-						{
-							"key": "resourceType",
-							"value": "VL"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Generic Neutron Virtual Link uniqueId",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "d906fb7e-04f9-445e-be5a-9644520171e1",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vl_found = false;",
-							"for (var i = 0; i < jsonData.resources.length; i++) { ",
-							"   if (jsonData.resources[i].name === pm.environment.get(\"virtual_link_type\")) {",
-							"       vl_found = true;",
-							"       pm.environment.set(\"auto_virtual_link_unique_id\", \"\"+jsonData.resources[i].uniqueId+\"\");",
-							"       tests[\"Virtual Link : \"+pm.environment.get(\"virtual_link_type\")+\" found in SDC catalog with uniqueId = \"+pm.environment.get(\"auto_virtual_link_unique_id\")] = true;",
-							"   }",
-							"}",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/screen?excludeTypes=VFCMT&excludeTypes=Configuration",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"screen"
-					],
-					"query": [
-						{
-							"key": "excludeTypes",
-							"value": "VFCMT"
-						},
-						{
-							"key": "excludeTypes",
-							"value": "Configuration"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add a Generic Neutron VirtualLink to Service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "0f07c2d5-49a1-4bf8-a3b5-6502674821af",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_virtual_link_customization_uuid\", \"\"+jsonData.customizationUUID+\"\");",
-							"pm.environment.set(\"auto_virtual_link_name_for_model\", \"\"+jsonData.name+\"\");",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\t\"name\": \"{{virtual_link_type}}\",\r\n\t\"componentVersion\": \"1.0\",\r\n\t\"posY\": 200,\r\n\t\"posX\": 300,\r\n\t\"uniqueId\": \"{{auto_virtual_link_unique_id}}\",\r\n\t\"originType\": \"VL\",\r\n\t\"componentUid\": \"{{auto_virtual_link_unique_id}}\",\r\n\t\"icon\": \"defaulticon\"\r\n}\r\n"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/resourceInstance",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"resourceInstance"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Submit for testing",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "f3215da0-5a6c-474c-9cc2-6733b36f1347",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"READY_FOR_CERTIFICATION\";",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\":\"please test\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certificationRequest",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"lifecycleState",
-						"certificationRequest"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Start Certification",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e9143951-e32e-4d93-b970-20b54ea64fd4",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFICATION_IN_PROGRESS\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "jm0007"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/startCertification",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"lifecycleState",
-						"startCertification"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Certify",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "2ca11efa-040f-4927-b30f-e58912f0db83",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFIED\";",
-							"",
-							"pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData.uniqueId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "jm0007"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\":\"ok\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certify",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"lifecycleState",
-						"certify"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Service infos by uniqueID to get new_service_unique_id",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "cecdbf68-2176-4dc1-8321-6285d57a2e8f",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData[\"metadata\"][\"allVersions\"][\"1.0\"]+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/filteredDataByParams?include=metadata",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"filteredDataByParams"
-					],
-					"query": [
-						{
-							"key": "include",
-							"value": "metadata"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Approve distribution",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ef5105ec-e9ea-454a-954a-3398364ecb89",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTION_APPROVED\";",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "gv0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\":\"ok\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution-state/approve",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_new_unique_id}}",
-						"distribution-state",
-						"approve"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Distribute service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "cf7fe737-3858-4235-88b8-73640775d871",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTED\";",
-							"",
-							"pm.environment.set(\"auto_vf_module_model_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_customization_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupUUID+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_invariant_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].invariantUUID+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_customization_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].customizationUUID+\"\");",
-							"pm.environment.set(\"auto_virtual_link_model_customization_uuid\", \"\"+jsonData.componentInstances[1].customizationUUID+\"\");"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "op0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution/PROD/activate",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_new_unique_id}}",
-						"distribution",
-						"PROD",
-						"activate"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check distribution",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "401f90b3-649f-4f3f-a2bd-ef996a54e47b",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var distrib_done = false;",
-							"for (var i = 0; i < jsonData.distributionStatusOfServiceList.length; i++) { ",
-							"   if (jsonData.distributionStatusOfServiceList[i].deployementStatus === \"Distributed\") {",
-							"       distrib_done = true;",
-							"       pm.environment.set(\"auto_distribution_id\", \"\"+jsonData.distributionStatusOfServiceList[i].distributionID+\"\");",
-							"",
-							"   }",
-							"}",
-							"if (distrib_done === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed\"] = true;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "op0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YmVlcDpib29w"
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_uuid}}/distribution",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_uuid}}",
-						"distribution"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check distribution fully completed after 60s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "86932912-3b35-409d-bdbf-003550969f10",
-						"exec": [
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var jsonData = pm.response.json();",
-							"var distrib_SO = false;",
-							"var distrib_AAI = false;",
-							"var distrib_SDNC = false;",
-							"var distrib_MultiCloud = false;",
-							"var distrib_CDS = false;",
-							"var distrib_policy = false;",
-							"",
-							"for (var i = 0; i < jsonData.distributionStatusList.length; i++) { ",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"SO-COpenSource-Env11\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_SO = true;",
-							"   }",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"aai-ml\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_AAI = true;",
-							"   }",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"sdc-COpenSource-Env11-sdnc-dockero\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_SDNC = true;",
-							"   }",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"multicloud-k8s-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_MultiCloud = true;",
-							"   }",
-							"    if ((jsonData.distributionStatusList[i].omfComponentID === \"cds\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_CDS = true;",
-							"   }",
-							"    if ((jsonData.distributionStatusList[i].omfComponentID === \"policy-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_policy = true;",
-							"   } ",
-							"}",
-							"",
-							"",
-							"if (distrib_SO === false) {",
-							"    tests[pm.globals.get(\"service\")+\" not distributed to SO\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to SO\"] = true;",
-							"}",
-							"",
-							"if (distrib_AAI === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to AAI\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to AAI\"] = true;",
-							"}",
-							"",
-							"if (distrib_SDNC === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to SDNC\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to SDNC\"] = true;",
-							"}",
-							"if (distrib_MultiCloud === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to MultiCloud\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to MultiCloud\"] = true;",
-							"}",
-							"if (distrib_CDS === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to CDS\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to CDS\"] = true;",
-							"}",
-							"if (distrib_policy === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to Policy\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to Policy\"] = true;",
-							"}",
-							""
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "9a1093c2-5c2d-47f6-892e-1a049cff8931",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "op0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YmVlcDpib29w"
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/distribution/{{auto_distribution_id}}",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"distribution",
-						"{{auto_distribution_id}}"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "dcfc4671-1cb4-453a-8fef-97a0ba533daa",
+    "name": "06_Onboard_Service",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "check  service exists and get infos",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "4f27b99e-23ac-4e7c-a1dc-c42ad63d6f65",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var service_found = false;",
+              "for (var i = 0; i < jsonData.length; i++) { ",
+              "   if (jsonData[i].name === pm.environment.get(\"service\")) {",
+              "       service_found = true;",
+              "       pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[i].uuid+\"\");",
+              "       pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
+              "   }",
+              "}",
+              "if (service_found === false) {",
+              "    tests[pm.environment.get(\"service\")+\" does not exist yet, we continue the run\"] = true;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" already exists, stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/services",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare an aLaCarte Service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e6118e78-e476-4049-8e81-f81b53ba625a",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[\"invariantUUID\"]+\"\");",
+              "pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[\"uuid\"]+\"\");",
+              "pm.environment.set(\"auto_service_unique_id\", \"\"+jsonData[\"uniqueId\"]+\"\");",
+              "",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKOUT\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\t\"artifacts\": {},\r\n\t\"toscaArtifacts\": {},\r\n\t\"contactId\": \"cs0008\",\r\n\t\"categories\": [{\r\n\t\t\"name\": \"Network Service\",\r\n\t\t\"normalizedName\": \"network service\",\r\n\t\t\"uniqueId\": \"serviceNewCategory.network service\",\r\n\t\t\"icons\": [\"network_l_1-3\"],\r\n\t\t\"subcategories\": null,\r\n\t\t\"version\": null,\r\n\t\t\"ownerId\": null,\r\n\t\t\"empty\": false,\r\n\t\t\"type\": null\r\n\t}],\r\n\t\"description\": \"Service {{service}}\",\r\n\t\"icon\": \"defaulticon\",\r\n\t\"componentInstancesProperties\": {},\r\n\t\"componentInstancesAttributes\": {},\r\n\t\"name\": \"{{service}}\",\r\n\t\"tags\": [\"{{service}}\"],\r\n\t\"capabilities\": {},\r\n\t\"requirements\": {},\r\n\t\"deploymentArtifacts\": {},\r\n\t\"componentType\": \"SERVICE\",\r\n\t\"projectCode\": \"123456\",\r\n\t\"componentInstances\": [],\r\n\t\"properties\": [],\r\n\t\"attributes\": [],\r\n\t\"forwardingPaths\": {},\r\n\t\"ecompGeneratedNaming\": true,\r\n\t\"serviceApiArtifacts\": {},\r\n\t\"instantiationType\": \"A-la-carte\",\r\n\t\"environmentContext\": \"General_Revenue-Bearing\"\r\n}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check VF exists and get uuid",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "87b90661-aefb-4ec9-94fc-fb5277f8c283",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vf_found = false;",
+              "if (jsonData.name === pm.environment.get(\"vf_name\")) {",
+              "    vf_found = true;",
+              "    pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData.uuid+\"\");",
+              "    pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData.invariantUUID+\"\");",
+              "    ",
+              "}",
+              "",
+              "if (vf_found === false) {",
+              "    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" does not exists, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "",
+              "}",
+              "",
+              "else {",
+              "    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" exists, we continue the run\"] = true;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/resources/{{auto_vf_uuid}}/metadata",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "resources",
+            "{{auto_vf_uuid}}",
+            "metadata"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get  VF uniqueId",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "16c73747-c973-40d9-ba3f-6061199386ec",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var vf_found = false;",
+              "for (var i = 0; i < jsonData.resources.length; i++) { ",
+              "   if (jsonData.resources[i].name === pm.environment.get(\"vf_name\")) {",
+              "       vf_found = true;",
+              "       pm.environment.set(\"auto_vf_unique_id\", \"\"+jsonData.resources[i].uniqueId+\"\");",
+              "   }",
+              "}",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/screen?excludeTypes=VFCMT&excludeTypes=Configuration",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "screen"
+          ],
+          "query": [
+            {
+              "key": "excludeTypes",
+              "value": "VFCMT"
+            },
+            {
+              "key": "excludeTypes",
+              "value": "Configuration"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add VF to Service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "897b4588-b2e6-4af6-b469-09ae6ea3b797",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_vf_customization_uuid\", \"\"+jsonData.customizationUUID+\"\");",
+              "pm.environment.set(\"auto_vf_name_for_model\", \"\"+jsonData.name+\"\");",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\t\"name\": \"{{vf_name}}\",\r\n\t\"componentVersion\": \"1.0\",\r\n\t\"posY\": 100,\r\n\t\"posX\": 200,\r\n\t\"uniqueId\": \"{{auto_vf_unique_id}}\",\r\n\t\"originType\": \"VF\",\r\n\t\"componentUid\": \"{{auto_vf_unique_id}}\",\r\n\t\"icon\": \"defaulticon\"\r\n}\r\n"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/resourceInstance",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "resourceInstance"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Generic Neutron Virtual Link infos",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "8bc90be4-f039-44cb-af75-7f3addd63bdd",
+            "exec": [
+              "var vl_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"virtual_link_type\")+\" does not exists\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "    var jsonData = pm.response.json();",
+              "    for (var i = 0; i < jsonData.length; i++) { ",
+              "       if (jsonData[i].name === pm.environment.get(\"virtual_link_type\")) {",
+              "           vl_found = true;",
+              "           pm.environment.set(\"auto_virtual_link_uuid\", \"\"+jsonData[i].uuid+\"\");",
+              "           pm.environment.set(\"auto_virtual_link_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
+              "       }",
+              "    }",
+              "    if (vl_found === false) {",
+              "        tests[pm.environment.get(\"virtual_link_type\")+\" does not exists, we stop the run\"] = false;",
+              "        postman.setNextRequest(null);",
+              "    }",
+              "    ",
+              "    else {",
+              "        tests[pm.environment.get(\"virtual_link_type\")+\" exists, we continue the run\"] = true;",
+              "    }",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/resources?resourceType=VL",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "resources"
+          ],
+          "query": [
+            {
+              "key": "resourceType",
+              "value": "VL"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Generic Neutron Virtual Link uniqueId",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "d906fb7e-04f9-445e-be5a-9644520171e1",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vl_found = false;",
+              "for (var i = 0; i < jsonData.resources.length; i++) { ",
+              "   if (jsonData.resources[i].name === pm.environment.get(\"virtual_link_type\")) {",
+              "       vl_found = true;",
+              "       pm.environment.set(\"auto_virtual_link_unique_id\", \"\"+jsonData.resources[i].uniqueId+\"\");",
+              "       tests[\"Virtual Link : \"+pm.environment.get(\"virtual_link_type\")+\" found in SDC catalog with uniqueId = \"+pm.environment.get(\"auto_virtual_link_unique_id\")] = true;",
+              "   }",
+              "}",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/screen?excludeTypes=VFCMT&excludeTypes=Configuration",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "screen"
+          ],
+          "query": [
+            {
+              "key": "excludeTypes",
+              "value": "VFCMT"
+            },
+            {
+              "key": "excludeTypes",
+              "value": "Configuration"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add a Generic Neutron VirtualLink to Service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "0f07c2d5-49a1-4bf8-a3b5-6502674821af",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_virtual_link_customization_uuid\", \"\"+jsonData.customizationUUID+\"\");",
+              "pm.environment.set(\"auto_virtual_link_name_for_model\", \"\"+jsonData.name+\"\");",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\t\"name\": \"{{virtual_link_type}}\",\r\n\t\"componentVersion\": \"1.0\",\r\n\t\"posY\": 200,\r\n\t\"posX\": 300,\r\n\t\"uniqueId\": \"{{auto_virtual_link_unique_id}}\",\r\n\t\"originType\": \"VL\",\r\n\t\"componentUid\": \"{{auto_virtual_link_unique_id}}\",\r\n\t\"icon\": \"defaulticon\"\r\n}\r\n"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/resourceInstance",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "resourceInstance"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Submit for testing",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "f3215da0-5a6c-474c-9cc2-6733b36f1347",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"READY_FOR_CERTIFICATION\";",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\":\"please test\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certificationRequest",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "lifecycleState",
+            "certificationRequest"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Start Certification",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e9143951-e32e-4d93-b970-20b54ea64fd4",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFICATION_IN_PROGRESS\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "jm0007"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/startCertification",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "lifecycleState",
+            "startCertification"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Certify",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "2ca11efa-040f-4927-b30f-e58912f0db83",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFIED\";",
+              "",
+              "pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData.uniqueId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "jm0007"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\":\"ok\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certify",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "lifecycleState",
+            "certify"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Service infos by uniqueID to get new_service_unique_id",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "cecdbf68-2176-4dc1-8321-6285d57a2e8f",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData[\"metadata\"][\"allVersions\"][\"1.0\"]+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/filteredDataByParams?include=metadata",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "filteredDataByParams"
+          ],
+          "query": [
+            {
+              "key": "include",
+              "value": "metadata"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Approve distribution",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ef5105ec-e9ea-454a-954a-3398364ecb89",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTION_APPROVED\";",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "gv0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\":\"ok\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution-state/approve",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_new_unique_id}}",
+            "distribution-state",
+            "approve"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Distribute service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "cf7fe737-3858-4235-88b8-73640775d871",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTED\";",
+              "",
+              "pm.environment.set(\"auto_vf_module_model_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_customization_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupUUID+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_invariant_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].invariantUUID+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_customization_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].customizationUUID+\"\");",
+              "pm.environment.set(\"auto_virtual_link_model_customization_uuid\", \"\"+jsonData.componentInstances[1].customizationUUID+\"\");"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "op0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution/PROD/activate",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_new_unique_id}}",
+            "distribution",
+            "PROD",
+            "activate"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check distribution",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "401f90b3-649f-4f3f-a2bd-ef996a54e47b",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var distrib_done = false;",
+              "for (var i = 0; i < jsonData.distributionStatusOfServiceList.length; i++) { ",
+              "   if (jsonData.distributionStatusOfServiceList[i].deployementStatus === \"Distributed\") {",
+              "       distrib_done = true;",
+              "       pm.environment.set(\"auto_distribution_id\", \"\"+jsonData.distributionStatusOfServiceList[i].distributionID+\"\");",
+              "",
+              "   }",
+              "}",
+              "if (distrib_done === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed\"] = true;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "op0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YmVlcDpib29w"
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_uuid}}/distribution",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_uuid}}",
+            "distribution"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check distribution fully completed after 60s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "86932912-3b35-409d-bdbf-003550969f10",
+            "exec": [
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var jsonData = pm.response.json();",
+              "var distrib_SO = false;",
+              "var distrib_AAI = false;",
+              "var distrib_SDNC = false;",
+              "var distrib_MultiCloud = false;",
+              "var distrib_CDS = false;",
+              "var distrib_policy = false;",
+              "",
+              "for (var i = 0; i < jsonData.distributionStatusList.length; i++) { ",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"SO-COpenSource-Env11\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_SO = true;",
+              "   }",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"aai-ml\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_AAI = true;",
+              "   }",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"sdc-COpenSource-Env11-sdnc-dockero\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_SDNC = true;",
+              "   }",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"multicloud-k8s-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_MultiCloud = true;",
+              "   }",
+              "    if ((jsonData.distributionStatusList[i].omfComponentID === \"cds\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_CDS = true;",
+              "   }",
+              "    if ((jsonData.distributionStatusList[i].omfComponentID === \"policy-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_policy = true;",
+              "   } ",
+              "}",
+              "",
+              "",
+              "if (distrib_SO === false) {",
+              "    tests[pm.globals.get(\"service\")+\" not distributed to SO\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to SO\"] = true;",
+              "}",
+              "",
+              "if (distrib_AAI === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to AAI\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to AAI\"] = true;",
+              "}",
+              "",
+              "if (distrib_SDNC === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to SDNC\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to SDNC\"] = true;",
+              "}",
+              "if (distrib_MultiCloud === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to MultiCloud\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to MultiCloud\"] = true;",
+              "}",
+              "if (distrib_CDS === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to CDS\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to CDS\"] = true;",
+              "}",
+              "if (distrib_policy === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to Policy\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to Policy\"] = true;",
+              "}",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "9a1093c2-5c2d-47f6-892e-1a049cff8931",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "op0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YmVlcDpib29w"
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/distribution/{{auto_distribution_id}}",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "distribution",
+            "{{auto_distribution_id}}"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/06_Onboard_Service_Macro.postman_collection.json b/test/postman/06_Onboard_Service_Macro.postman_collection.json
index 0514a72..9b5ef68 100644
--- a/test/postman/06_Onboard_Service_Macro.postman_collection.json
+++ b/test/postman/06_Onboard_Service_Macro.postman_collection.json
@@ -1,1149 +1,1149 @@
 {
-	"info": {
-		"_postman_id": "aa0955ae-1dd8-48b8-ac63-01117a1c6c2e",
-		"name": "06_Onboard_Service_Macro",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "check  service exists and get infos",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "4f27b99e-23ac-4e7c-a1dc-c42ad63d6f65",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var service_found = false;",
-							"for (var i = 0; i < jsonData.length; i++) { ",
-							"   if (jsonData[i].name === pm.environment.get(\"service_name_macro\")) {",
-							"       service_found = true;",
-							"       pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[i].uuid+\"\");",
-							"       pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
-							"   }",
-							"}",
-							"if (service_found === false) {",
-							"    tests[pm.environment.get(\"service_name_macro\")+\" does not exist yet, we continue the run\"] = true;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service_name_macro\")+\" already exists, stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/services",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare a Service in Macro mode",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e6118e78-e476-4049-8e81-f81b53ba625a",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[\"invariantUUID\"]+\"\");",
-							"pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[\"uuid\"]+\"\");",
-							"pm.environment.set(\"auto_service_unique_id\", \"\"+jsonData[\"uniqueId\"]+\"\");",
-							"",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKOUT\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\t\"artifacts\": {},\r\n\t\"toscaArtifacts\": {},\r\n\t\"contactId\": \"cs0008\",\r\n\t\"categories\": [{\r\n\t\t\"name\": \"Network Service\",\r\n\t\t\"normalizedName\": \"network service\",\r\n\t\t\"uniqueId\": \"serviceNewCategory.network service\",\r\n\t\t\"icons\": [\"network_l_1-3\"],\r\n\t\t\"subcategories\": null,\r\n\t\t\"version\": null,\r\n\t\t\"ownerId\": null,\r\n\t\t\"empty\": false,\r\n\t\t\"type\": null\r\n\t}],\r\n\t\"description\": \"Service {{service_name_macro}}\",\r\n\t\"icon\": \"defaulticon\",\r\n\t\"componentInstancesProperties\": {},\r\n\t\"componentInstancesAttributes\": {},\r\n\t\"name\": \"{{service_name_macro}}\",\r\n\t\"tags\": [\"{{service_name_macro}}\"],\r\n\t\"capabilities\": {},\r\n\t\"requirements\": {},\r\n\t\"deploymentArtifacts\": {},\r\n\t\"componentType\": \"SERVICE\",\r\n\t\"projectCode\": \"123456\",\r\n\t\"componentInstances\": [],\r\n\t\"properties\": [],\r\n\t\"attributes\": [],\r\n\t\"forwardingPaths\": {},\r\n\t\"ecompGeneratedNaming\": true,\r\n\t\"serviceApiArtifacts\": {},\r\n\t\"instantiationType\": \"Macro\",\r\n\t\"environmentContext\": \"General_Revenue-Bearing\"\r\n}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check VF exists and get uuid",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "87b90661-aefb-4ec9-94fc-fb5277f8c283",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var vf_found = false;",
-							"if (jsonData.name === pm.environment.get(\"vf_name\")) {",
-							"    vf_found = true;",
-							"    pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData.uuid+\"\");",
-							"    pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData.invariantUUID+\"\");",
-							"    ",
-							"}",
-							"",
-							"if (vf_found === false) {",
-							"    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" does not exists, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"",
-							"}",
-							"",
-							"else {",
-							"    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" exists, we continue the run\"] = true;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/resources/{{auto_vf_uuid}}/metadata",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"resources",
-						"{{auto_vf_uuid}}",
-						"metadata"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get  VF uniqueId",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "16c73747-c973-40d9-ba3f-6061199386ec",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var vf_found = false;",
-							"for (var i = 0; i < jsonData.resources.length; i++) { ",
-							"   if (jsonData.resources[i].name === pm.environment.get(\"vf_name\")) {",
-							"       vf_found = true;",
-							"       pm.environment.set(\"auto_vf_unique_id\", \"\"+jsonData.resources[i].uniqueId+\"\");",
-							"   }",
-							"}",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/screen?excludeTypes=VFCMT&excludeTypes=Configuration",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"screen"
-					],
-					"query": [
-						{
-							"key": "excludeTypes",
-							"value": "VFCMT"
-						},
-						{
-							"key": "excludeTypes",
-							"value": "Configuration"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add VF to Service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "897b4588-b2e6-4af6-b469-09ae6ea3b797",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_vf_customization_uuid\", \"\"+jsonData.customizationUUID+\"\");",
-							"pm.environment.set(\"auto_vf_name_for_model\", \"\"+jsonData.name+\"\");",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\t\"name\": \"{{vf_name}}\",\r\n\t\"componentVersion\": \"1.0\",\r\n\t\"posY\": 100,\r\n\t\"posX\": 200,\r\n\t\"uniqueId\": \"{{auto_vf_unique_id}}\",\r\n\t\"originType\": \"VF\",\r\n\t\"componentUid\": \"{{auto_vf_unique_id}}\",\r\n\t\"icon\": \"defaulticon\"\r\n}\r\n"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/resourceInstance",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"resourceInstance"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Submit for testing",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "f3215da0-5a6c-474c-9cc2-6733b36f1347",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"READY_FOR_CERTIFICATION\";",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\":\"please test\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certificationRequest",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"lifecycleState",
-						"certificationRequest"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Start Certification",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e9143951-e32e-4d93-b970-20b54ea64fd4",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFICATION_IN_PROGRESS\";"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "jm0007"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/startCertification",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"lifecycleState",
-						"startCertification"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Certify",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "2ca11efa-040f-4927-b30f-e58912f0db83",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFIED\";",
-							"",
-							"pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData.uniqueId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "jm0007"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\":\"ok\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certify",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"lifecycleState",
-						"certify"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get Service infos by uniqueID to get new_service_unique_id",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "cecdbf68-2176-4dc1-8321-6285d57a2e8f",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData[\"metadata\"][\"allVersions\"][\"1.0\"]+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/filteredDataByParams?include=metadata",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_unique_id}}",
-						"filteredDataByParams"
-					],
-					"query": [
-						{
-							"key": "include",
-							"value": "metadata"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Approve distribution",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ef5105ec-e9ea-454a-954a-3398364ecb89",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTION_APPROVED\";",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "gv0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\"userRemarks\":\"ok\"}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution-state/approve",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_new_unique_id}}",
-						"distribution-state",
-						"approve"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Distribute service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "cf7fe737-3858-4235-88b8-73640775d871",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTED\";",
-							"",
-							"pm.environment.set(\"auto_vf_module_model_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_customization_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupUUID+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_invariant_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].invariantUUID+\"\");",
-							"pm.environment.set(\"auto_vf_module_model_customization_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].customizationUUID+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "op0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{}"
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution/PROD/activate",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_new_unique_id}}",
-						"distribution",
-						"PROD",
-						"activate"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check distribution",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "401f90b3-649f-4f3f-a2bd-ef996a54e47b",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var distrib_done = false;",
-							"for (var i = 0; i < jsonData.distributionStatusOfServiceList.length; i++) { ",
-							"   if (jsonData.distributionStatusOfServiceList[i].deployementStatus === \"Distributed\") {",
-							"       distrib_done = true;",
-							"       pm.environment.set(\"auto_distribution_id\", \"\"+jsonData.distributionStatusOfServiceList[i].distributionID+\"\");",
-							"",
-							"   }",
-							"}",
-							"if (distrib_done === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed, we stop the run\"] = false;",
-							"    postman.setNextRequest(null);",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed\"] = true;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "op0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YmVlcDpib29w"
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_uuid}}/distribution",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"{{auto_service_uuid}}",
-						"distribution"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check distribution fully completed after 60s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "86932912-3b35-409d-bdbf-003550969f10",
-						"exec": [
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var jsonData = pm.response.json();",
-							"var distrib_SO = false;",
-							"var distrib_AAI = false;",
-							"var distrib_SDNC = false;",
-							"var distrib_MultiCloud = false;",
-							"var distrib_CDS = false;",
-							"var distrib_policy = false;",
-							"",
-							"for (var i = 0; i < jsonData.distributionStatusList.length; i++) { ",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"SO-COpenSource-Env11\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_SO = true;",
-							"   }",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"aai-ml\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_AAI = true;",
-							"   }",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"sdc-COpenSource-Env11-sdnc-dockero\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_SDNC = true;",
-							"   }",
-							"   if ((jsonData.distributionStatusList[i].omfComponentID === \"multicloud-k8s-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_MultiCloud = true;",
-							"   }",
-							"    if ((jsonData.distributionStatusList[i].omfComponentID === \"cds\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_CDS = true;",
-							"   }",
-							"    if ((jsonData.distributionStatusList[i].omfComponentID === \"policy-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
-							"   {",
-							"       distrib_policy = true;",
-							"   } ",
-							"}",
-							"",
-							"",
-							"if (distrib_SO === false) {",
-							"    tests[pm.globals.get(\"service\")+\" not distributed to SO\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to SO\"] = true;",
-							"}",
-							"",
-							"if (distrib_AAI === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to AAI\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to AAI\"] = true;",
-							"}",
-							"",
-							"if (distrib_SDNC === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to SDNC\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to SDNC\"] = true;",
-							"}",
-							"if (distrib_MultiCloud === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to MultiCloud\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to MultiCloud\"] = true;",
-							"}",
-							"if (distrib_CDS === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to CDS\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to CDS\"] = true;",
-							"}",
-							"if (distrib_policy === false) {",
-							"    tests[pm.environment.get(\"service\")+\" not distributed to Policy\"] = false;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"service\")+\" distributed to Policy\"] = true;",
-							"}",
-							""
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "9a1093c2-5c2d-47f6-892e-1a049cff8931",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "op0001"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YmVlcDpib29w"
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/distribution/{{auto_distribution_id}}",
-					"host": [
-						"{{url-sdc2}}"
-					],
-					"path": [
-						"sdc1",
-						"feProxy",
-						"rest",
-						"v1",
-						"catalog",
-						"services",
-						"distribution",
-						"{{auto_distribution_id}}"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "aa0955ae-1dd8-48b8-ac63-01117a1c6c2e",
+    "name": "06_Onboard_Service_Macro",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "check  service exists and get infos",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "4f27b99e-23ac-4e7c-a1dc-c42ad63d6f65",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var service_found = false;",
+              "for (var i = 0; i < jsonData.length; i++) { ",
+              "   if (jsonData[i].name === pm.environment.get(\"service_name_macro\")) {",
+              "       service_found = true;",
+              "       pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[i].uuid+\"\");",
+              "       pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[i].invariantUUID+\"\");",
+              "   }",
+              "}",
+              "if (service_found === false) {",
+              "    tests[pm.environment.get(\"service_name_macro\")+\" does not exist yet, we continue the run\"] = true;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service_name_macro\")+\" already exists, stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/services",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare a Service in Macro mode",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e6118e78-e476-4049-8e81-f81b53ba625a",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_service_invariant_uuid\", \"\"+jsonData[\"invariantUUID\"]+\"\");",
+              "pm.environment.set(\"auto_service_uuid\", \"\"+jsonData[\"uuid\"]+\"\");",
+              "pm.environment.set(\"auto_service_unique_id\", \"\"+jsonData[\"uniqueId\"]+\"\");",
+              "",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"NOT_CERTIFIED_CHECKOUT\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\t\"artifacts\": {},\r\n\t\"toscaArtifacts\": {},\r\n\t\"contactId\": \"cs0008\",\r\n\t\"categories\": [{\r\n\t\t\"name\": \"Network Service\",\r\n\t\t\"normalizedName\": \"network service\",\r\n\t\t\"uniqueId\": \"serviceNewCategory.network service\",\r\n\t\t\"icons\": [\"network_l_1-3\"],\r\n\t\t\"subcategories\": null,\r\n\t\t\"version\": null,\r\n\t\t\"ownerId\": null,\r\n\t\t\"empty\": false,\r\n\t\t\"type\": null\r\n\t}],\r\n\t\"description\": \"Service {{service_name_macro}}\",\r\n\t\"icon\": \"defaulticon\",\r\n\t\"componentInstancesProperties\": {},\r\n\t\"componentInstancesAttributes\": {},\r\n\t\"name\": \"{{service_name_macro}}\",\r\n\t\"tags\": [\"{{service_name_macro}}\"],\r\n\t\"capabilities\": {},\r\n\t\"requirements\": {},\r\n\t\"deploymentArtifacts\": {},\r\n\t\"componentType\": \"SERVICE\",\r\n\t\"projectCode\": \"123456\",\r\n\t\"componentInstances\": [],\r\n\t\"properties\": [],\r\n\t\"attributes\": [],\r\n\t\"forwardingPaths\": {},\r\n\t\"ecompGeneratedNaming\": true,\r\n\t\"serviceApiArtifacts\": {},\r\n\t\"instantiationType\": \"Macro\",\r\n\t\"environmentContext\": \"General_Revenue-Bearing\"\r\n}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check VF exists and get uuid",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "87b90661-aefb-4ec9-94fc-fb5277f8c283",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var vf_found = false;",
+              "if (jsonData.name === pm.environment.get(\"vf_name\")) {",
+              "    vf_found = true;",
+              "    pm.environment.set(\"auto_vf_uuid\", \"\"+jsonData.uuid+\"\");",
+              "    pm.environment.set(\"auto_vf_invariant_uuid\", \"\"+jsonData.invariantUUID+\"\");",
+              "    ",
+              "}",
+              "",
+              "if (vf_found === false) {",
+              "    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" does not exists, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "",
+              "}",
+              "",
+              "else {",
+              "    tests[\"VF \"+pm.environment.get(\"vf_name\")+\" exists, we continue the run\"] = true;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/resources/{{auto_vf_uuid}}/metadata",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "resources",
+            "{{auto_vf_uuid}}",
+            "metadata"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get  VF uniqueId",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "16c73747-c973-40d9-ba3f-6061199386ec",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var vf_found = false;",
+              "for (var i = 0; i < jsonData.resources.length; i++) { ",
+              "   if (jsonData.resources[i].name === pm.environment.get(\"vf_name\")) {",
+              "       vf_found = true;",
+              "       pm.environment.set(\"auto_vf_unique_id\", \"\"+jsonData.resources[i].uniqueId+\"\");",
+              "   }",
+              "}",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/screen?excludeTypes=VFCMT&excludeTypes=Configuration",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "screen"
+          ],
+          "query": [
+            {
+              "key": "excludeTypes",
+              "value": "VFCMT"
+            },
+            {
+              "key": "excludeTypes",
+              "value": "Configuration"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add VF to Service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "897b4588-b2e6-4af6-b469-09ae6ea3b797",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_vf_customization_uuid\", \"\"+jsonData.customizationUUID+\"\");",
+              "pm.environment.set(\"auto_vf_name_for_model\", \"\"+jsonData.name+\"\");",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\t\"name\": \"{{vf_name}}\",\r\n\t\"componentVersion\": \"1.0\",\r\n\t\"posY\": 100,\r\n\t\"posX\": 200,\r\n\t\"uniqueId\": \"{{auto_vf_unique_id}}\",\r\n\t\"originType\": \"VF\",\r\n\t\"componentUid\": \"{{auto_vf_unique_id}}\",\r\n\t\"icon\": \"defaulticon\"\r\n}\r\n"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/resourceInstance",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "resourceInstance"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Submit for testing",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "f3215da0-5a6c-474c-9cc2-6733b36f1347",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"READY_FOR_CERTIFICATION\";",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\":\"please test\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certificationRequest",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "lifecycleState",
+            "certificationRequest"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Start Certification",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e9143951-e32e-4d93-b970-20b54ea64fd4",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFICATION_IN_PROGRESS\";"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "jm0007"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/startCertification",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "lifecycleState",
+            "startCertification"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Certify",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "2ca11efa-040f-4927-b30f-e58912f0db83",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Service status is : \"+jsonData.lifecycleState] = jsonData.lifecycleState === \"CERTIFIED\";",
+              "",
+              "pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData.uniqueId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "jm0007"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\":\"ok\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/lifecycleState/certify",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "lifecycleState",
+            "certify"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get Service infos by uniqueID to get new_service_unique_id",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "cecdbf68-2176-4dc1-8321-6285d57a2e8f",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_service_new_unique_id\", \"\"+jsonData[\"metadata\"][\"allVersions\"][\"1.0\"]+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_unique_id}}/filteredDataByParams?include=metadata",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_unique_id}}",
+            "filteredDataByParams"
+          ],
+          "query": [
+            {
+              "key": "include",
+              "value": "metadata"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Approve distribution",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ef5105ec-e9ea-454a-954a-3398364ecb89",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTION_APPROVED\";",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "gv0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\"userRemarks\":\"ok\"}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution-state/approve",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_new_unique_id}}",
+            "distribution-state",
+            "approve"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Distribute service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "cf7fe737-3858-4235-88b8-73640775d871",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"Distribution status is : \"+jsonData.distributionStatus] = jsonData.distributionStatus === \"DISTRIBUTED\";",
+              "",
+              "pm.environment.set(\"auto_vf_module_model_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_customization_name\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupName+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].groupUUID+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_invariant_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].invariantUUID+\"\");",
+              "pm.environment.set(\"auto_vf_module_model_customization_uuid\", \"\"+jsonData.componentInstances[0].groupInstances[0].customizationUUID+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "op0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{}"
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_new_unique_id}}/distribution/PROD/activate",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_new_unique_id}}",
+            "distribution",
+            "PROD",
+            "activate"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check distribution",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "401f90b3-649f-4f3f-a2bd-ef996a54e47b",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var distrib_done = false;",
+              "for (var i = 0; i < jsonData.distributionStatusOfServiceList.length; i++) { ",
+              "   if (jsonData.distributionStatusOfServiceList[i].deployementStatus === \"Distributed\") {",
+              "       distrib_done = true;",
+              "       pm.environment.set(\"auto_distribution_id\", \"\"+jsonData.distributionStatusOfServiceList[i].distributionID+\"\");",
+              "",
+              "   }",
+              "}",
+              "if (distrib_done === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed, we stop the run\"] = false;",
+              "    postman.setNextRequest(null);",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed\"] = true;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "op0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YmVlcDpib29w"
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/{{auto_service_uuid}}/distribution",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "{{auto_service_uuid}}",
+            "distribution"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check distribution fully completed after 60s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "86932912-3b35-409d-bdbf-003550969f10",
+            "exec": [
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var jsonData = pm.response.json();",
+              "var distrib_SO = false;",
+              "var distrib_AAI = false;",
+              "var distrib_SDNC = false;",
+              "var distrib_MultiCloud = false;",
+              "var distrib_CDS = false;",
+              "var distrib_policy = false;",
+              "",
+              "for (var i = 0; i < jsonData.distributionStatusList.length; i++) { ",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"SO-COpenSource-Env11\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_SO = true;",
+              "   }",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"aai-ml\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_AAI = true;",
+              "   }",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"sdc-COpenSource-Env11-sdnc-dockero\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_SDNC = true;",
+              "   }",
+              "   if ((jsonData.distributionStatusList[i].omfComponentID === \"multicloud-k8s-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_MultiCloud = true;",
+              "   }",
+              "    if ((jsonData.distributionStatusList[i].omfComponentID === \"cds\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_CDS = true;",
+              "   }",
+              "    if ((jsonData.distributionStatusList[i].omfComponentID === \"policy-id\") && (jsonData.distributionStatusList[i].status === \"DOWNLOAD_OK\"))",
+              "   {",
+              "       distrib_policy = true;",
+              "   } ",
+              "}",
+              "",
+              "",
+              "if (distrib_SO === false) {",
+              "    tests[pm.globals.get(\"service\")+\" not distributed to SO\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to SO\"] = true;",
+              "}",
+              "",
+              "if (distrib_AAI === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to AAI\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to AAI\"] = true;",
+              "}",
+              "",
+              "if (distrib_SDNC === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to SDNC\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to SDNC\"] = true;",
+              "}",
+              "if (distrib_MultiCloud === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to MultiCloud\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to MultiCloud\"] = true;",
+              "}",
+              "if (distrib_CDS === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to CDS\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to CDS\"] = true;",
+              "}",
+              "if (distrib_policy === false) {",
+              "    tests[pm.environment.get(\"service\")+\" not distributed to Policy\"] = false;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"service\")+\" distributed to Policy\"] = true;",
+              "}",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "9a1093c2-5c2d-47f6-892e-1a049cff8931",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "op0001"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YmVlcDpib29w"
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc2}}/sdc1/feProxy/rest/v1/catalog/services/distribution/{{auto_distribution_id}}",
+          "host": [
+            "{{url-sdc2}}"
+          ],
+          "path": [
+            "sdc1",
+            "feProxy",
+            "rest",
+            "v1",
+            "catalog",
+            "services",
+            "distribution",
+            "{{auto_distribution_id}}"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/07_Declare_owningEntity_LineOfBusiness_project_platform.postman_collection.json b/test/postman/07_Declare_owningEntity_LineOfBusiness_project_platform.postman_collection.json
index 8406935..a1bceb3 100644
--- a/test/postman/07_Declare_owningEntity_LineOfBusiness_project_platform.postman_collection.json
+++ b/test/postman/07_Declare_owningEntity_LineOfBusiness_project_platform.postman_collection.json
@@ -1,302 +1,302 @@
 {
-	"info": {
-		"_postman_id": "4d04e8e7-d495-4dcc-a800-1cf4ab643403",
-		"name": "07_Declare_owningEntity_LineOfBusiness_project_platform",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "Declare owningEntity in VID",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "0643260b-1c9a-450e-aa72-ac2115244a97",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept-Encoding",
-						"value": "gzip, deflate"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"options\": [\"{{owning_entity_name}}\"]\n}"
-				},
-				"url": {
-					"raw": "{{url-vid}}/vid/maintenance/category_parameter/owningEntity",
-					"host": [
-						"{{url-vid}}"
-					],
-					"path": [
-						"vid",
-						"maintenance",
-						"category_parameter",
-						"owningEntity"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "declare Owning-Entity in AAI",
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"owning-entity-name\": \"{{owning_entity_name}}\",\n    \"owning-entity-id\": \"{{owning_entity_id}}\"\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v13/business/owning-entities/owning-entity/{{owning_entity_id}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v13",
-						"business",
-						"owning-entities",
-						"owning-entity",
-						"{{owning_entity_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Get owning-entities",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "294b8cb1-67a3-435d-817f-7fd5497183db",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var oe_found = false;",
-							"for (var i = 0; i < jsonData[\"owning-entity\"].length; i++) { ",
-							"   if (jsonData[\"owning-entity\"][i][\"owning-entity-name\"] === pm.environment.get(\"owning_entity\")) {",
-							"       oe_found = true;",
-							"       pm.environment.set(\"auto_owning_entity_id\", \"\"+jsonData[\"owning-entity\"][i][\"owning-entity-id\"]+\"\");",
-							"   }",
-							"}",
-							"tests[\"Owning-Entity \"+pm.environment.get(\"owning_entity\")+\" found and id saved\"] = oe_found === true;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/owning-entities",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"owning-entities"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare platform",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "6d0d2a8b-b756-4386-9113-d39722218bf5",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"options\": [\"{{platform}}\"]\n}"
-				},
-				"url": {
-					"raw": "{{url-vid}}/vid/maintenance/category_parameter/platform",
-					"host": [
-						"{{url-vid}}"
-					],
-					"path": [
-						"vid",
-						"maintenance",
-						"category_parameter",
-						"platform"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare lineOfBusiness",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e177b994-db59-4b13-b003-b6fc0dda6907",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"options\": [\"{{lineofbusiness}}\"]\n}"
-				},
-				"url": {
-					"raw": "{{url-vid}}/vid/maintenance/category_parameter/lineOfBusiness",
-					"host": [
-						"{{url-vid}}"
-					],
-					"path": [
-						"vid",
-						"maintenance",
-						"category_parameter",
-						"lineOfBusiness"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare project",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "a5eb2421-a949-44f9-a8f7-786b672aede3",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"options\": [\"{{project}}\"]\n}"
-				},
-				"url": {
-					"raw": "{{url-vid}}/vid/maintenance/category_parameter/project",
-					"host": [
-						"{{url-vid}}"
-					],
-					"path": [
-						"vid",
-						"maintenance",
-						"category_parameter",
-						"project"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "4d04e8e7-d495-4dcc-a800-1cf4ab643403",
+    "name": "07_Declare_owningEntity_LineOfBusiness_project_platform",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "Declare owningEntity in VID",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "0643260b-1c9a-450e-aa72-ac2115244a97",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept-Encoding",
+            "value": "gzip, deflate"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"options\": [\"{{owning_entity_name}}\"]\n}"
+        },
+        "url": {
+          "raw": "{{url-vid}}/vid/maintenance/category_parameter/owningEntity",
+          "host": [
+            "{{url-vid}}"
+          ],
+          "path": [
+            "vid",
+            "maintenance",
+            "category_parameter",
+            "owningEntity"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "declare Owning-Entity in AAI",
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"owning-entity-name\": \"{{owning_entity_name}}\",\n    \"owning-entity-id\": \"{{owning_entity_id}}\"\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v13/business/owning-entities/owning-entity/{{owning_entity_id}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v13",
+            "business",
+            "owning-entities",
+            "owning-entity",
+            "{{owning_entity_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Get owning-entities",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "294b8cb1-67a3-435d-817f-7fd5497183db",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var oe_found = false;",
+              "for (var i = 0; i < jsonData[\"owning-entity\"].length; i++) { ",
+              "   if (jsonData[\"owning-entity\"][i][\"owning-entity-name\"] === pm.environment.get(\"owning_entity\")) {",
+              "       oe_found = true;",
+              "       pm.environment.set(\"auto_owning_entity_id\", \"\"+jsonData[\"owning-entity\"][i][\"owning-entity-id\"]+\"\");",
+              "   }",
+              "}",
+              "tests[\"Owning-Entity \"+pm.environment.get(\"owning_entity\")+\" found and id saved\"] = oe_found === true;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/owning-entities",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "owning-entities"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare platform",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "6d0d2a8b-b756-4386-9113-d39722218bf5",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"options\": [\"{{platform}}\"]\n}"
+        },
+        "url": {
+          "raw": "{{url-vid}}/vid/maintenance/category_parameter/platform",
+          "host": [
+            "{{url-vid}}"
+          ],
+          "path": [
+            "vid",
+            "maintenance",
+            "category_parameter",
+            "platform"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare lineOfBusiness",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e177b994-db59-4b13-b003-b6fc0dda6907",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"options\": [\"{{lineofbusiness}}\"]\n}"
+        },
+        "url": {
+          "raw": "{{url-vid}}/vid/maintenance/category_parameter/lineOfBusiness",
+          "host": [
+            "{{url-vid}}"
+          ],
+          "path": [
+            "vid",
+            "maintenance",
+            "category_parameter",
+            "lineOfBusiness"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare project",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "a5eb2421-a949-44f9-a8f7-786b672aede3",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"options\": [\"{{project}}\"]\n}"
+        },
+        "url": {
+          "raw": "{{url-vid}}/vid/maintenance/category_parameter/project",
+          "host": [
+            "{{url-vid}}"
+          ],
+          "path": [
+            "vid",
+            "maintenance",
+            "category_parameter",
+            "project"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/08_Declare_Customer_Service_Subscription_Cloud.postman_collection.json b/test/postman/08_Declare_Customer_Service_Subscription_Cloud.postman_collection.json
index d5e3bbf..f9fb3c5 100644
--- a/test/postman/08_Declare_Customer_Service_Subscription_Cloud.postman_collection.json
+++ b/test/postman/08_Declare_Customer_Service_Subscription_Cloud.postman_collection.json
@@ -1,1647 +1,1647 @@
 {
-	"info": {
-		"_postman_id": "4e86ffd4-736b-441d-8ff2-56a584a96573",
-		"name": "08_Declare_Customer_Service_Subscription_Cloud",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "List Customers",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "5c0ee107-621b-4b01-9506-cd8628b01179",
-						"exec": [
-							"var customer_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"customer_name\")+\" does not exists\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"    var jsonData = pm.response.json();",
-							"    for (var i = 0; i < jsonData.customer.length; i++) { ",
-							"       if (jsonData.customer[i][\"global-customer-id\"] === pm.environment.get(\"customer_name\")) {",
-							"           customer_found = true;",
-							"           pm.environment.set(\"auto_customer_id\", \"\"+jsonData.customer[i][\"global-customer-id\"]+\"\");",
-							"       }",
-							"    }",
-							"    if (customer_found === false) {",
-							"        tests[pm.environment.get(\"customer_name\")+\" does not exists\"] = true;",
-							"    }",
-							"    ",
-							"    else {",
-							"        tests[pm.environment.get(\"customer_name\")+\" already exists, we skip creation\"] = true;",
-							"        postman.setNextRequest(\"List Services from SDC catalog\");",
-							"    }",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare a Customer",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "3f8fbd67-36f6-4ae2-a2ab-d23f1f690133",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"global-customer-id\": \"{{customer_name}}\",\n    \"subscriber-name\": \"{{customer_name}}\",\n    \"subscriber-type\": \"INFRA\"\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers",
-						"customer",
-						"{{customer_name}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check customer creation",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e459dbcf-bf32-4aef-a9b1-5d1adfb525fc",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var customer_found = false;",
-							"for (var i = 0; i < jsonData.customer.length; i++) { ",
-							"   if (jsonData.customer[i][\"global-customer-id\"] === pm.environment.get(\"customer_name\")) {",
-							"       customer_found = true;",
-							"       pm.environment.set(\"auto_customer_id\", \"\"+jsonData.customer[i][\"global-customer-id\"]+\"\");",
-							"   }",
-							"}",
-							"tests[pm.environment.get(\"customer_name\")+\" found\"] = customer_found === true;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "List Services from SDC catalog",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "a496d4dc-e343-42d4-8377-6d18d3570c82",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var service_found = false;",
-							"for (var i = 0; i < jsonData.length; i++) { ",
-							"   if (jsonData[i].name === pm.environment.get(\"service\")) {",
-							"       service_found = true;",
-							"       pm.environment.set(\"auto_service_invariantUUID\", \"\"+jsonData[i].invariantUUID+\"\");",
-							"   }",
-							"}",
-							"",
-							"if (service_found === false) {",
-							"    tests[\"Service : \"+pm.environment.get(\"service\")+\" does not exist in SDC catalog, we stop the run\"] = true;",
-							"    postman.setNextRequest(null);",
-							"}",
-							"",
-							"else {",
-							"    tests[\"Service : \"+pm.environment.get(\"service\")+\" exists in SDC catalog, we can continue the run\"] = true;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "USER_ID",
-						"value": "cs0008"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "ONAP-Test"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
-					},
-					{
-						"key": "x-ecomp-instanceid",
-						"value": "ONAP-Test"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-sdc}}/sdc/v1/catalog/services",
-					"host": [
-						"{{url-sdc}}"
-					],
-					"path": [
-						"sdc",
-						"v1",
-						"catalog",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check Subscription in AAI",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "654cc91a-920b-4b79-9177-15b622749cb4",
-						"exec": [
-							"var service_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"service\")+\" does not exists in AAI\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"    var jsonData = pm.response.json();",
-							"    for (var i = 0; i < jsonData.service.length; i++) { ",
-							"       if (jsonData.service[i][\"service-description\"] === pm.environment.get(\"service\")) {",
-							"           service_found = true;",
-							"       }",
-							"    }",
-							"    ",
-							"    if (service_found === false) {",
-							"        tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" does not exists in AAI\"] = true;",
-							"    }",
-							"    ",
-							"    else {",
-							"        tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" already exists in AAI, we skip creation\"] = true;",
-							"        postman.setNextRequest(\"check cloud-region exists\");",
-							"    }",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/service-design-and-creation/services",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"service-design-and-creation",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Declare subscription in AAI",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "c82062d1-c394-47d8-ab3d-14f777c32971",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n\"service-id\": \"{{auto_service_invariantUUID}}\",\r\n\"service-description\": \"{{service}}\"\r\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/service-design-and-creation/services/service/{{auto_service_invariantUUID}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"service-design-and-creation",
-						"services",
-						"service",
-						"{{auto_service_invariantUUID}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check Subscription creation in AAI",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ddb1ab24-cbf4-4d50-a237-614143e66a66",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var service_found = false;",
-							"for (var i = 0; i < jsonData.service.length; i++) { ",
-							"   if (jsonData.service[i][\"service-description\"] === pm.environment.get(\"service\")) {",
-							"       service_found = true;",
-							"       pm.environment.set(\"auto_service_resource_version\", \"\"+jsonData.service[i][\"resource-version\"]+\"\");",
-							"   }",
-							"}",
-							"tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" found in AAI\"] = service_found === true;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/service-design-and-creation/services",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"service-design-and-creation",
-						"services"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check complex exists",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "12df16bd-e361-45ec-8663-b8a404bb13ce",
-						"exec": [
-							"var complex_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"complex_name\")+\" does not exists in AAI\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"var jsonData = pm.response.json();",
-							"for (var i = 0; i < jsonData[\"complex\"].length; i++) { ",
-							"   if (jsonData[\"complex\"][i][\"complex-name\"] === pm.environment.get(\"complex_name\")) {",
-							"       complex_found = true;",
-							"   }",
-							"}",
-							"",
-							"if (complex_found === false) {",
-							"    tests[pm.environment.get(\"complex_name\")+\" does not exist yet\"] = true;",
-							"}",
-							"else {",
-							"    tests[pm.environment.get(\"complex_name\")+\" already exists, we skip creation\"] = true;",
-							"    postman.setNextRequest(\"check cloud-region exists\");",
-							"}",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/complexes",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"complexes"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "create Complex",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "c6021ddb-13b1-472b-acdd-55c4f550461f",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"physical-location-id\": \"{{complex_name}}\",\n    \"data-center-code\": \"\",\n    \"complex-name\": \"{{complex_name}}\",\n    \"identity-url\": \"\",\n    \"physical-location-type\": \"\",\n    \"street1\": \"\",\n    \"street2\": \"\",\n    \"city\": \"\",\n    \"state\": \"\",\n    \"postal-code\": \"\",\n    \"country\": \"\",\n    \"region\": \"\",\n    \"latitude\": \"\",\n    \"longitude\": \"\",\n    \"elevation\": \"\",\n    \"lata\": \"\"\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/complexes/complex/{{complex_name}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"complexes",
-						"complex",
-						"{{complex_name}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check complex creation",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "eed67b4e-d3b5-4ba7-a254-6e8d44e10be0",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"var complex_found = false;",
-							"for (var i = 0; i < jsonData[\"complex\"].length; i++) { ",
-							"   if (jsonData[\"complex\"][i][\"complex-name\"] === pm.environment.get(\"complex_name\")) {",
-							"       complex_found = true;",
-							"   }",
-							"}",
-							"tests[\"Complex : \"+pm.environment.get(\"complex_name\")+\" found\"] = complex_found === true;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/complexes",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"complexes"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check cloud-region exists",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "705695aa-21b8-4b3f-9e00-4f46178f37d0",
-						"exec": [
-							"var region_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"onap_cloud_region_id\")+\" does not exists in AAI\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"var jsonData = pm.response.json();",
-							"for (var i = 0; i < jsonData[\"cloud-region\"].length; i++) { ",
-							"   if ((jsonData[\"cloud-region\"][i][\"cloud-region-id\"] === pm.environment.get(\"onap_cloud_region_id\")) && (jsonData[\"cloud-region\"][i][\"cloud-owner\"] === pm.environment.get(\"cloud_owner_name\"))) {",
-							"       region_found = true;",
-							"   }",
-							"}",
-							"",
-							"if (region_found === false) {",
-							"    tests[pm.environment.get(\"onap_cloud_region_id\")+\" does not exist yet for cloudOwner \"+pm.environment.get(\"cloud_owner_name\")] = true;",
-							"}",
-							"else {",
-							"    tests[pm.environment.get(\"onap_cloud_region_id\")+\" already exists, we skip creation\"] = true;",
-							"    postman.setNextRequest(\"check tenant in cloud region\");",
-							"}",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "create cloud-region",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "41f77bea-f6cd-4bd9-961d-b02f42751db0",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\r\n    \"cloud-owner\": \"{{cloud_owner_name}}\",\r\n    \"cloud-region-id\": \"{{onap_cloud_region_id}}\",\r\n    \"cloud-type\": \"{{cloud_type}}\",\r\n    \"owner-defined-type\": \"\",\r\n    \"cloud-region-version\": \"{{cloud_region_version}}\",\r\n    \"cloud-zone\": \"\",\r\n    \"complex-name\": \"{{complex_name}}\",\r\n    \"identity-url\": \"WillBeUpdatedByMultiCloud\",\r\n    \"sriov-automation\": false,\r\n    \"cloud-extra-info\": \"{\\\"openstack-region-id\\\":\\\"{{openstack_region_id}}\\\"}\",\r\n    \"esr-system-info-list\": {\r\n    \t\"esr-system-info\": [\r\n            {\r\n            \"esr-system-info-id\": \"{{random_uuid}}\",\r\n            \"service-url\": \"{{keystone_url}}\",\r\n            \"user-name\": \"{{user_name}}\",\r\n            \"password\": \"{{keystone_password}}\",\r\n            \"system-type\": \"VIM\",\r\n            \"ssl-insecure\": true,\r\n            \"cloud-domain\": \"Default\",\r\n            \"default-tenant\": \"{{tenant_name}}\",\r\n            \"system-status\": \"active\"\r\n            }\r\n        ]\r\n    }\r\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check Cloud-region creation",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "a386bb95-c0fa-49b2-9837-efcdc6b40a86",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var region_found = false;",
-							"for (var i = 0; i < jsonData[\"cloud-region\"].length; i++) { ",
-							"   if (jsonData[\"cloud-region\"][i][\"cloud-region-id\"] === pm.environment.get(\"onap_cloud_region_id\")) {",
-							"       region_found = true;",
-							"   }",
-							"}",
-							"tests[\"Cloud-Region : \"+pm.environment.get(\"onap_cloud_region_id\")+\" found\"] = region_found === true;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "associate Cloud-region to a complex",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ad16fc86-7954-434f-bc45-25710ebeee57",
-						"exec": [
-							"tests[\"Status code is 200 : cloud-region associated to complex\"] = pm.response.code === 200;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"related-to\": \"complex\",\n    \"related-link\": \"/aai/v16/cloud-infrastructure/complexes/complex/{{complex_name}}\",\n    \"relationship-data\": [\n        {\n        \"relationship-key\": \"complex.physical-location-id\",\n        \"relationship-value\": \"{{complex_name}}\"\n        }\n        ]\n    }"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/relationship-list/relationship",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}",
-						"relationship-list",
-						"relationship"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check availability-zone in cloud region",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "4367f5c4-0bf0-4e09-bc58-9a8bd6578685",
-						"exec": [
-							"var availability_zone_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"availability_zone_name\")+\" does not exists\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"    var jsonData = pm.response.json();",
-							"    for (var i = 0; i < jsonData[\"availability-zone\"].length; i++) { ",
-							"        if (jsonData[\"availability-zone\"][i][\"availability-zone-name\"] === pm.environment.get(\"availability_zone_name\")) {",
-							"            availability_zone_found = true;",
-							"        }",
-							"    }   ",
-							"    tests[\"Availability Zone : \"+pm.environment.get(\"availability_zone_name\")+\" found\"] = availability_zone_found === true;",
-							"}",
-							"",
-							"",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/availability-zones",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}",
-						"availability-zones"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add availability-zone in cloud region",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "4d1eee0e-6afd-44e8-b1cc-269a1249232d",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"availability-zone-name\": \"{{availability_zone_name}}\",\n    \"hypervisor-type\": \"{{hypervisor_type}}\"\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/availability-zones/availability-zone/{{availability_zone_name}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}",
-						"availability-zones",
-						"availability-zone",
-						"{{availability_zone_name}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check tenant in cloud region",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "4367f5c4-0bf0-4e09-bc58-9a8bd6578685",
-						"exec": [
-							"var tenant_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"tenant_name\")+\" does not exists in AAI\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"var jsonData = pm.response.json();",
-							"",
-							"if(jsonData.hasOwnProperty('tenant'))",
-							"    {",
-							"    for (var i = 0; i < jsonData.tenant.length; i++) ",
-							"        { ",
-							"        if (jsonData.tenant[i]['tenant-id'] === pm.environment.get(\"tenant_id\")) ",
-							"            {",
-							"            tenant_found = true;",
-							"            }",
-							"        }",
-							"    if (tenant_found === true) ",
-							"        {",
-							"        tests[pm.environment.get(\"tenant_name\")+\" already exists, we skip creation\"] = true;",
-							"        postman.setNextRequest(\"check customer-service-tenant relations\");",
-							"        }",
-							"",
-							"if (tenant_found === false)",
-							"    {",
-							"    tests[pm.environment.get(\"tenant_name\")+\" does not exists\"] = true;",
-							"    }",
-							"}",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}",
-						"tenants"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "add tenant to region",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "4d1eee0e-6afd-44e8-b1cc-269a1249232d",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"tenant-id\": \"{{tenant_id}}\",\n    \"tenant-name\": \"{{tenant_name}}\"\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants/tenant/{{tenant_id}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}",
-						"tenants",
-						"tenant",
-						"{{tenant_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check tenant creation",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "716f0a8a-37b3-412f-8d7b-acef34597bee",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var tenant_found = false;",
-							"for (var i = 0; i < jsonData.tenant.length; i++) { ",
-							"   if (jsonData.tenant[i][\"tenant-id\"] === pm.environment.get(\"tenant_id\")) {",
-							"       tenant_found = true;",
-							"   }",
-							"}",
-							"tests[pm.environment.get(\"tenant_name\")+\" found\"] = tenant_found === true;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"cloud-infrastructure",
-						"cloud-regions",
-						"cloud-region",
-						"{{cloud_owner_name}}",
-						"{{onap_cloud_region_id}}",
-						"tenants"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check customer-service-tenant relations",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "587ed4e3-e181-49c1-9f21-08d366a52587",
-						"exec": [
-							"var relation_found = false;",
-							"if (pm.response.code === 404) {",
-							"    tests[pm.environment.get(\"tenant_name\")+\" / \"+pm.environment.get(\"service\")+ \" relation does not exists\"] = true;",
-							"}",
-							"else {",
-							"    if (pm.response.code === 200) {",
-							"        tests[\"Status code is 200\"] = pm.response.code === 200;",
-							"        }",
-							"",
-							"var jsonData = pm.response.json();",
-							"for (var i = 0; i < jsonData[\"service-subscription\"].length; i++) { ",
-							"   if (jsonData[\"service-subscription\"][i][\"service-type\"] === pm.environment.get(\"service\")) {",
-							"       relation_found = true;",
-							"   }",
-							"}",
-							"",
-							"if (relation_found === false) {",
-							"    tests[pm.environment.get(\"tenant_name\")+\" / \"+pm.environment.get(\"service\")+ \" relation does not exists\"] = true;",
-							"}",
-							"",
-							"else {",
-							"    tests[pm.environment.get(\"tenant_name\")+\" / \"+pm.environment.get(\"service\")+ \" already exists, we skip relation creation\"] = true;",
-							"    postman.setNextRequest(\"check customer-service-tenant relation creation\");",
-							"}",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions?depth=all",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers",
-						"customer",
-						"{{customer_name}}",
-						"service-subscriptions"
-					],
-					"query": [
-						{
-							"key": "depth",
-							"value": "all"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add service to customer",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "9a9da50d-49ce-4f9e-ae18-6131dce516eb",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"service-id\": \"{{auto_service_id}}\"\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions/service-subscription/{{service}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers",
-						"customer",
-						"{{customer_name}}",
-						"service-subscriptions",
-						"service-subscription",
-						"{{service}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add tenant to service-customer",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "9a9da50d-49ce-4f9e-ae18-6131dce516eb",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "PUT",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"related-to\": \"tenant\",\n    \"related-link\": \"/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants/tenant/{{tenant_id}}\",\n    \"relationship-data\": [\n        {\n            \"relationship-key\": \"cloud-region.cloud-owner\",\n            \"relationship-value\": \"{{cloud_owner_name}}\"\n        },\n        {\n            \"relationship-key\": \"cloud-region.cloud-region-id\",\n            \"relationship-value\": \"{{onap_cloud_region_id}}\"\n        },\n        {\n            \"relationship-key\": \"tenant.tenant-id\",\n            \"relationship-value\": \"{{tenant_id}}\"\n        }\n    ],\n    \"related-to-property\": [\n        {\n            \"property-key\": \"tenant.tenant-name\",\n            \"property-value\": \"{{tenant_name}}\"\n        }\n    ]\n}"
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions/service-subscription/{{service}}/relationship-list/relationship",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers",
-						"customer",
-						"{{customer_name}}",
-						"service-subscriptions",
-						"service-subscription",
-						"{{service}}",
-						"relationship-list",
-						"relationship"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check customer-service-tenant relation creation",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "10e61ec5-243b-4ce6-b9b8-a29054df2504",
-						"exec": [
-							"tests[\"Status code is 200\"] = responseCode.code === 200;",
-							"",
-							"var jsonData = pm.response.json();",
-							"var service_found = false;",
-							"for (var i = 0; i < jsonData[\"service-subscription\"].length; i++) { ",
-							"   if (jsonData[\"service-subscription\"][i][\"service-type\"] === pm.environment.get(\"service\")) {",
-							"       service_found = true;",
-							"   }",
-							"}",
-							"tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" found for customer : \"+pm.environment.get(\"customer_name\")] = service_found === true;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions?depth=all",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"business",
-						"customers",
-						"customer",
-						"{{customer_name}}",
-						"service-subscriptions"
-					],
-					"query": [
-						{
-							"key": "depth",
-							"value": "all"
-						}
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "4e86ffd4-736b-441d-8ff2-56a584a96573",
+    "name": "08_Declare_Customer_Service_Subscription_Cloud",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "List Customers",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "5c0ee107-621b-4b01-9506-cd8628b01179",
+            "exec": [
+              "var customer_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"customer_name\")+\" does not exists\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "    var jsonData = pm.response.json();",
+              "    for (var i = 0; i < jsonData.customer.length; i++) { ",
+              "       if (jsonData.customer[i][\"global-customer-id\"] === pm.environment.get(\"customer_name\")) {",
+              "           customer_found = true;",
+              "           pm.environment.set(\"auto_customer_id\", \"\"+jsonData.customer[i][\"global-customer-id\"]+\"\");",
+              "       }",
+              "    }",
+              "    if (customer_found === false) {",
+              "        tests[pm.environment.get(\"customer_name\")+\" does not exists\"] = true;",
+              "    }",
+              "    ",
+              "    else {",
+              "        tests[pm.environment.get(\"customer_name\")+\" already exists, we skip creation\"] = true;",
+              "        postman.setNextRequest(\"List Services from SDC catalog\");",
+              "    }",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare a Customer",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "3f8fbd67-36f6-4ae2-a2ab-d23f1f690133",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"global-customer-id\": \"{{customer_name}}\",\n    \"subscriber-name\": \"{{customer_name}}\",\n    \"subscriber-type\": \"INFRA\"\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers",
+            "customer",
+            "{{customer_name}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check customer creation",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e459dbcf-bf32-4aef-a9b1-5d1adfb525fc",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var customer_found = false;",
+              "for (var i = 0; i < jsonData.customer.length; i++) { ",
+              "   if (jsonData.customer[i][\"global-customer-id\"] === pm.environment.get(\"customer_name\")) {",
+              "       customer_found = true;",
+              "       pm.environment.set(\"auto_customer_id\", \"\"+jsonData.customer[i][\"global-customer-id\"]+\"\");",
+              "   }",
+              "}",
+              "tests[pm.environment.get(\"customer_name\")+\" found\"] = customer_found === true;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "List Services from SDC catalog",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "a496d4dc-e343-42d4-8377-6d18d3570c82",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var service_found = false;",
+              "for (var i = 0; i < jsonData.length; i++) { ",
+              "   if (jsonData[i].name === pm.environment.get(\"service\")) {",
+              "       service_found = true;",
+              "       pm.environment.set(\"auto_service_invariantUUID\", \"\"+jsonData[i].invariantUUID+\"\");",
+              "   }",
+              "}",
+              "",
+              "if (service_found === false) {",
+              "    tests[\"Service : \"+pm.environment.get(\"service\")+\" does not exist in SDC catalog, we stop the run\"] = true;",
+              "    postman.setNextRequest(null);",
+              "}",
+              "",
+              "else {",
+              "    tests[\"Service : \"+pm.environment.get(\"service\")+\" exists in SDC catalog, we can continue the run\"] = true;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "USER_ID",
+            "value": "cs0008"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "ONAP-Test"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWFpOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="
+          },
+          {
+            "key": "x-ecomp-instanceid",
+            "value": "ONAP-Test"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-sdc}}/sdc/v1/catalog/services",
+          "host": [
+            "{{url-sdc}}"
+          ],
+          "path": [
+            "sdc",
+            "v1",
+            "catalog",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check Subscription in AAI",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "654cc91a-920b-4b79-9177-15b622749cb4",
+            "exec": [
+              "var service_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"service\")+\" does not exists in AAI\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "    var jsonData = pm.response.json();",
+              "    for (var i = 0; i < jsonData.service.length; i++) { ",
+              "       if (jsonData.service[i][\"service-description\"] === pm.environment.get(\"service\")) {",
+              "           service_found = true;",
+              "       }",
+              "    }",
+              "    ",
+              "    if (service_found === false) {",
+              "        tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" does not exists in AAI\"] = true;",
+              "    }",
+              "    ",
+              "    else {",
+              "        tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" already exists in AAI, we skip creation\"] = true;",
+              "        postman.setNextRequest(\"check cloud-region exists\");",
+              "    }",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/service-design-and-creation/services",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "service-design-and-creation",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Declare subscription in AAI",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "c82062d1-c394-47d8-ab3d-14f777c32971",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n\"service-id\": \"{{auto_service_invariantUUID}}\",\r\n\"service-description\": \"{{service}}\"\r\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/service-design-and-creation/services/service/{{auto_service_invariantUUID}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "service-design-and-creation",
+            "services",
+            "service",
+            "{{auto_service_invariantUUID}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check Subscription creation in AAI",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ddb1ab24-cbf4-4d50-a237-614143e66a66",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var service_found = false;",
+              "for (var i = 0; i < jsonData.service.length; i++) { ",
+              "   if (jsonData.service[i][\"service-description\"] === pm.environment.get(\"service\")) {",
+              "       service_found = true;",
+              "       pm.environment.set(\"auto_service_resource_version\", \"\"+jsonData.service[i][\"resource-version\"]+\"\");",
+              "   }",
+              "}",
+              "tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" found in AAI\"] = service_found === true;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/service-design-and-creation/services",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "service-design-and-creation",
+            "services"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check complex exists",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "12df16bd-e361-45ec-8663-b8a404bb13ce",
+            "exec": [
+              "var complex_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"complex_name\")+\" does not exists in AAI\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "var jsonData = pm.response.json();",
+              "for (var i = 0; i < jsonData[\"complex\"].length; i++) { ",
+              "   if (jsonData[\"complex\"][i][\"complex-name\"] === pm.environment.get(\"complex_name\")) {",
+              "       complex_found = true;",
+              "   }",
+              "}",
+              "",
+              "if (complex_found === false) {",
+              "    tests[pm.environment.get(\"complex_name\")+\" does not exist yet\"] = true;",
+              "}",
+              "else {",
+              "    tests[pm.environment.get(\"complex_name\")+\" already exists, we skip creation\"] = true;",
+              "    postman.setNextRequest(\"check cloud-region exists\");",
+              "}",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/complexes",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "complexes"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "create Complex",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "c6021ddb-13b1-472b-acdd-55c4f550461f",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"physical-location-id\": \"{{complex_name}}\",\n    \"data-center-code\": \"\",\n    \"complex-name\": \"{{complex_name}}\",\n    \"identity-url\": \"\",\n    \"physical-location-type\": \"\",\n    \"street1\": \"\",\n    \"street2\": \"\",\n    \"city\": \"\",\n    \"state\": \"\",\n    \"postal-code\": \"\",\n    \"country\": \"\",\n    \"region\": \"\",\n    \"latitude\": \"\",\n    \"longitude\": \"\",\n    \"elevation\": \"\",\n    \"lata\": \"\"\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/complexes/complex/{{complex_name}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "complexes",
+            "complex",
+            "{{complex_name}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check complex creation",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "eed67b4e-d3b5-4ba7-a254-6e8d44e10be0",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "var complex_found = false;",
+              "for (var i = 0; i < jsonData[\"complex\"].length; i++) { ",
+              "   if (jsonData[\"complex\"][i][\"complex-name\"] === pm.environment.get(\"complex_name\")) {",
+              "       complex_found = true;",
+              "   }",
+              "}",
+              "tests[\"Complex : \"+pm.environment.get(\"complex_name\")+\" found\"] = complex_found === true;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/complexes",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "complexes"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check cloud-region exists",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "705695aa-21b8-4b3f-9e00-4f46178f37d0",
+            "exec": [
+              "var region_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"onap_cloud_region_id\")+\" does not exists in AAI\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "var jsonData = pm.response.json();",
+              "for (var i = 0; i < jsonData[\"cloud-region\"].length; i++) { ",
+              "   if ((jsonData[\"cloud-region\"][i][\"cloud-region-id\"] === pm.environment.get(\"onap_cloud_region_id\")) && (jsonData[\"cloud-region\"][i][\"cloud-owner\"] === pm.environment.get(\"cloud_owner_name\"))) {",
+              "       region_found = true;",
+              "   }",
+              "}",
+              "",
+              "if (region_found === false) {",
+              "    tests[pm.environment.get(\"onap_cloud_region_id\")+\" does not exist yet for cloudOwner \"+pm.environment.get(\"cloud_owner_name\")] = true;",
+              "}",
+              "else {",
+              "    tests[pm.environment.get(\"onap_cloud_region_id\")+\" already exists, we skip creation\"] = true;",
+              "    postman.setNextRequest(\"check tenant in cloud region\");",
+              "}",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "create cloud-region",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "41f77bea-f6cd-4bd9-961d-b02f42751db0",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\r\n    \"cloud-owner\": \"{{cloud_owner_name}}\",\r\n    \"cloud-region-id\": \"{{onap_cloud_region_id}}\",\r\n    \"cloud-type\": \"{{cloud_type}}\",\r\n    \"owner-defined-type\": \"\",\r\n    \"cloud-region-version\": \"{{cloud_region_version}}\",\r\n    \"cloud-zone\": \"\",\r\n    \"complex-name\": \"{{complex_name}}\",\r\n    \"identity-url\": \"WillBeUpdatedByMultiCloud\",\r\n    \"sriov-automation\": false,\r\n    \"cloud-extra-info\": \"{\\\"openstack-region-id\\\":\\\"{{openstack_region_id}}\\\"}\",\r\n    \"esr-system-info-list\": {\r\n    \t\"esr-system-info\": [\r\n            {\r\n            \"esr-system-info-id\": \"{{random_uuid}}\",\r\n            \"service-url\": \"{{keystone_url}}\",\r\n            \"user-name\": \"{{user_name}}\",\r\n            \"password\": \"{{keystone_password}}\",\r\n            \"system-type\": \"VIM\",\r\n            \"ssl-insecure\": true,\r\n            \"cloud-domain\": \"Default\",\r\n            \"default-tenant\": \"{{tenant_name}}\",\r\n            \"system-status\": \"active\"\r\n            }\r\n        ]\r\n    }\r\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check Cloud-region creation",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "a386bb95-c0fa-49b2-9837-efcdc6b40a86",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var region_found = false;",
+              "for (var i = 0; i < jsonData[\"cloud-region\"].length; i++) { ",
+              "   if (jsonData[\"cloud-region\"][i][\"cloud-region-id\"] === pm.environment.get(\"onap_cloud_region_id\")) {",
+              "       region_found = true;",
+              "   }",
+              "}",
+              "tests[\"Cloud-Region : \"+pm.environment.get(\"onap_cloud_region_id\")+\" found\"] = region_found === true;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "associate Cloud-region to a complex",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ad16fc86-7954-434f-bc45-25710ebeee57",
+            "exec": [
+              "tests[\"Status code is 200 : cloud-region associated to complex\"] = pm.response.code === 200;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"related-to\": \"complex\",\n    \"related-link\": \"/aai/v16/cloud-infrastructure/complexes/complex/{{complex_name}}\",\n    \"relationship-data\": [\n        {\n        \"relationship-key\": \"complex.physical-location-id\",\n        \"relationship-value\": \"{{complex_name}}\"\n        }\n        ]\n    }"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/relationship-list/relationship",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}",
+            "relationship-list",
+            "relationship"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check availability-zone in cloud region",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "4367f5c4-0bf0-4e09-bc58-9a8bd6578685",
+            "exec": [
+              "var availability_zone_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"availability_zone_name\")+\" does not exists\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "    var jsonData = pm.response.json();",
+              "    for (var i = 0; i < jsonData[\"availability-zone\"].length; i++) { ",
+              "        if (jsonData[\"availability-zone\"][i][\"availability-zone-name\"] === pm.environment.get(\"availability_zone_name\")) {",
+              "            availability_zone_found = true;",
+              "        }",
+              "    }   ",
+              "    tests[\"Availability Zone : \"+pm.environment.get(\"availability_zone_name\")+\" found\"] = availability_zone_found === true;",
+              "}",
+              "",
+              "",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/availability-zones",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}",
+            "availability-zones"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add availability-zone in cloud region",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "4d1eee0e-6afd-44e8-b1cc-269a1249232d",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"availability-zone-name\": \"{{availability_zone_name}}\",\n    \"hypervisor-type\": \"{{hypervisor_type}}\"\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/availability-zones/availability-zone/{{availability_zone_name}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}",
+            "availability-zones",
+            "availability-zone",
+            "{{availability_zone_name}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check tenant in cloud region",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "4367f5c4-0bf0-4e09-bc58-9a8bd6578685",
+            "exec": [
+              "var tenant_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"tenant_name\")+\" does not exists in AAI\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "var jsonData = pm.response.json();",
+              "",
+              "if(jsonData.hasOwnProperty('tenant'))",
+              "    {",
+              "    for (var i = 0; i < jsonData.tenant.length; i++) ",
+              "        { ",
+              "        if (jsonData.tenant[i]['tenant-id'] === pm.environment.get(\"tenant_id\")) ",
+              "            {",
+              "            tenant_found = true;",
+              "            }",
+              "        }",
+              "    if (tenant_found === true) ",
+              "        {",
+              "        tests[pm.environment.get(\"tenant_name\")+\" already exists, we skip creation\"] = true;",
+              "        postman.setNextRequest(\"check customer-service-tenant relations\");",
+              "        }",
+              "",
+              "if (tenant_found === false)",
+              "    {",
+              "    tests[pm.environment.get(\"tenant_name\")+\" does not exists\"] = true;",
+              "    }",
+              "}",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}",
+            "tenants"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "add tenant to region",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "4d1eee0e-6afd-44e8-b1cc-269a1249232d",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"tenant-id\": \"{{tenant_id}}\",\n    \"tenant-name\": \"{{tenant_name}}\"\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants/tenant/{{tenant_id}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}",
+            "tenants",
+            "tenant",
+            "{{tenant_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check tenant creation",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "716f0a8a-37b3-412f-8d7b-acef34597bee",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var tenant_found = false;",
+              "for (var i = 0; i < jsonData.tenant.length; i++) { ",
+              "   if (jsonData.tenant[i][\"tenant-id\"] === pm.environment.get(\"tenant_id\")) {",
+              "       tenant_found = true;",
+              "   }",
+              "}",
+              "tests[pm.environment.get(\"tenant_name\")+\" found\"] = tenant_found === true;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "cloud-infrastructure",
+            "cloud-regions",
+            "cloud-region",
+            "{{cloud_owner_name}}",
+            "{{onap_cloud_region_id}}",
+            "tenants"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check customer-service-tenant relations",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "587ed4e3-e181-49c1-9f21-08d366a52587",
+            "exec": [
+              "var relation_found = false;",
+              "if (pm.response.code === 404) {",
+              "    tests[pm.environment.get(\"tenant_name\")+\" / \"+pm.environment.get(\"service\")+ \" relation does not exists\"] = true;",
+              "}",
+              "else {",
+              "    if (pm.response.code === 200) {",
+              "        tests[\"Status code is 200\"] = pm.response.code === 200;",
+              "        }",
+              "",
+              "var jsonData = pm.response.json();",
+              "for (var i = 0; i < jsonData[\"service-subscription\"].length; i++) { ",
+              "   if (jsonData[\"service-subscription\"][i][\"service-type\"] === pm.environment.get(\"service\")) {",
+              "       relation_found = true;",
+              "   }",
+              "}",
+              "",
+              "if (relation_found === false) {",
+              "    tests[pm.environment.get(\"tenant_name\")+\" / \"+pm.environment.get(\"service\")+ \" relation does not exists\"] = true;",
+              "}",
+              "",
+              "else {",
+              "    tests[pm.environment.get(\"tenant_name\")+\" / \"+pm.environment.get(\"service\")+ \" already exists, we skip relation creation\"] = true;",
+              "    postman.setNextRequest(\"check customer-service-tenant relation creation\");",
+              "}",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions?depth=all",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers",
+            "customer",
+            "{{customer_name}}",
+            "service-subscriptions"
+          ],
+          "query": [
+            {
+              "key": "depth",
+              "value": "all"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add service to customer",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "9a9da50d-49ce-4f9e-ae18-6131dce516eb",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"service-id\": \"{{auto_service_id}}\"\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions/service-subscription/{{service}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers",
+            "customer",
+            "{{customer_name}}",
+            "service-subscriptions",
+            "service-subscription",
+            "{{service}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add tenant to service-customer",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "9a9da50d-49ce-4f9e-ae18-6131dce516eb",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "PUT",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"related-to\": \"tenant\",\n    \"related-link\": \"/aai/v16/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner_name}}/{{onap_cloud_region_id}}/tenants/tenant/{{tenant_id}}\",\n    \"relationship-data\": [\n        {\n            \"relationship-key\": \"cloud-region.cloud-owner\",\n            \"relationship-value\": \"{{cloud_owner_name}}\"\n        },\n        {\n            \"relationship-key\": \"cloud-region.cloud-region-id\",\n            \"relationship-value\": \"{{onap_cloud_region_id}}\"\n        },\n        {\n            \"relationship-key\": \"tenant.tenant-id\",\n            \"relationship-value\": \"{{tenant_id}}\"\n        }\n    ],\n    \"related-to-property\": [\n        {\n            \"property-key\": \"tenant.tenant-name\",\n            \"property-value\": \"{{tenant_name}}\"\n        }\n    ]\n}"
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions/service-subscription/{{service}}/relationship-list/relationship",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers",
+            "customer",
+            "{{customer_name}}",
+            "service-subscriptions",
+            "service-subscription",
+            "{{service}}",
+            "relationship-list",
+            "relationship"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check customer-service-tenant relation creation",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "10e61ec5-243b-4ce6-b9b8-a29054df2504",
+            "exec": [
+              "tests[\"Status code is 200\"] = responseCode.code === 200;",
+              "",
+              "var jsonData = pm.response.json();",
+              "var service_found = false;",
+              "for (var i = 0; i < jsonData[\"service-subscription\"].length; i++) { ",
+              "   if (jsonData[\"service-subscription\"][i][\"service-type\"] === pm.environment.get(\"service\")) {",
+              "       service_found = true;",
+              "   }",
+              "}",
+              "tests[\"Service subscription : \"+pm.environment.get(\"service\")+\" found for customer : \"+pm.environment.get(\"customer_name\")] = service_found === true;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "808b54e3-e563-4144-a1b9-e24e2ed93d4f"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/business/customers/customer/{{customer_name}}/service-subscriptions?depth=all",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "business",
+            "customers",
+            "customer",
+            "{{customer_name}}",
+            "service-subscriptions"
+          ],
+          "query": [
+            {
+              "key": "depth",
+              "value": "all"
+            }
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/10_instantiate_service_vnf_vfmodule.postman_collection.json b/test/postman/10_instantiate_service_vnf_vfmodule.postman_collection.json
index ff2a040..da35956 100644
--- a/test/postman/10_instantiate_service_vnf_vfmodule.postman_collection.json
+++ b/test/postman/10_instantiate_service_vnf_vfmodule.postman_collection.json
@@ -1,1360 +1,1360 @@
 {
-	"info": {
-		"_postman_id": "200601a1-b07a-4a07-ba56-a3fc357e9f55",
-		"name": "10_instantiate_service_vnf_vfmodule",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "GET ExternalAPI-NBI component Status (HealthCheck)",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ddeb2e4b-2ef6-4b58-8e5c-cc202fbb232a",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var NBI_status = false;",
-							"var jsonData = pm.response.json();",
-							"",
-							"if (jsonData.status === \"ok\") {",
-							"       NBI_status = true;",
-							"}",
-							"tests[\"NBI status OK\"] = NBI_status === true;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/status",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"status"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET all service models from Service Catalog API",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "d020751d-1ca5-4c47-af33-40faea633e62",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var service_found = false;",
-							"for (var i = 0; i < jsonData.length; i++) { ",
-							"   if (jsonData[i].name === pm.environment.get(\"service\")) {",
-							"       service_found = true;",
-							"       pm.environment.set(\"auto_service_id\", \"\"+jsonData[i].id+\"\");",
-							"   }",
-							"}",
-							"tests[\"Service : \"+pm.environment.get(\"service\")+\" exists\"] = service_found === true;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/serviceSpecification",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"serviceSpecification"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET all service instances via ServiceInventory API",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "79e173a3-297e-467f-8c9b-be90035a91aa",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var service_instance_found = false;",
-							"for (var i = 0; i < jsonData.length; i++) { ",
-							"   if (jsonData[i].name === pm.environment.get(\"service_instance_name\")) {",
-							"       service_instance_found = true;",
-							"   }",
-							"}",
-							"tests[\"Service instance : \"+pm.environment.get(\"service_instance_name\")+\" does not exist\"] = service_instance_found === false;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/service?relatedParty.id={{customer_name}}",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"service"
-					],
-					"query": [
-						{
-							"key": "relatedParty.id",
-							"value": "{{customer_name}}"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Add service instance via ServiceOrder API",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "9e3790c5-456a-44aa-9579-de3e9be2b61a",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"tests[pm.environment.get(\"externalId\")+\" exists\"] = jsonData.externalId === pm.environment.get(\"externalId\");",
-							"",
-							"pm.environment.set(\"auto_service_order_id\", jsonData.id);",
-							"    "
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n  \"externalId\": \"{{externalId}}\",\n  \"priority\": \"1\",\n  \"description\": \"{{service}} order for generic customer via Postman\",\n  \"category\": \"Consumer\",\n  \"requestedStartDate\": \"2018-04-26T08:33:37.299Z\",\n  \"requestedCompletionDate\": \"2018-04-26T08:33:37.299Z\",\n  \"relatedParty\": [\n    {\n      \"id\": \"{{customer_name}}\",\n      \"role\": \"ONAPcustomer\",\n      \"name\": \"{{customer_name}}\"\n    }\n  ],\n  \"orderItem\": [\n    {\n      \"id\": \"1\",\n      \"action\": \"add\",\n      \"service\": {\n        \"name\": \"{{service_instance_name}}\",\n        \"serviceState\": \"active\",\n        \"serviceSpecification\": {\n          \"id\": \"{{auto_service_id}}\"\n        }\n      }\n    }\n  ]\n}"
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/serviceOrder",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"serviceOrder"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET previous serviceOrder after 10s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "dc4fc1f9-cd6a-41c8-a972-06694d869384",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[pm.environment.get(\"externalId\")+\" exists\"] = jsonData.externalId === pm.environment.get(\"externalId\");",
-							"tests[\"service_order_id exists\"] = jsonData.id === pm.environment.get(\"auto_service_order_id\");",
-							"tests[\"service Order state is : \"+jsonData.state] = jsonData.state === \"completed\";",
-							"tests[\"Service Instance state is : \"+jsonData.orderItem[0].service.serviceState] = jsonData.orderItem[0].service.serviceState === \"active\";",
-							"",
-							"",
-							"if(jsonData.state == \"completed\"){",
-							"    pm.environment.set(\"auto_service_instance_id\", \"\"+jsonData.orderItem[0].service.id+\"\");",
-							"}",
-							"if (jsonData.orderMessage !== null){",
-							"    tests[\"order message is : \" +jsonData.orderMessage[0].messageInformation] = jsonData.orderMessage[0].messageInformation === \"\";",
-							"    pm.environment.set(\"auto_service_messageInformation\", \"\"+jsonData.orderMessage[0].messageInformation+\"\");",
-							"    }",
-							""
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "b2473649-e045-465e-84cc-0725d83d57ed",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/serviceOrder/{{auto_service_order_id}}",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"serviceOrder",
-						"{{auto_service_order_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "1536607a-13f7-4c9a-97a6-af7f5dbc0593",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"if (jsonData.requestList.length > 0){",
-							"    tests[\"requestState is : \"+jsonData.requestList[0].request.requestStatus.requestState] = jsonData.requestList[0].request.requestStatus.requestState === \"COMPLETE\";",
-							"    tests[\"statusMessage is : \"+jsonData.requestList[0].request.requestStatus.statusMessage] = jsonData.requestList[0].request.requestStatus.statusMessage === \"Service Instance was created successfully.\";",
-							"}",
-							"else {",
-							"    tests[\"no order for that service instance\"] = true === false;",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7?filter=serviceInstanceName:EQUALS:{{service_instance_name}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7"
-					],
-					"query": [
-						{
-							"key": "filter",
-							"value": "serviceInstanceName:EQUALS:{{service_instance_name}}"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Check service instance in inventory via NBI request",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "f1cbf2f1-1ed2-4d21-9483-46602241705d",
-						"exec": [
-							"tests[\"Service Instance : \"+ pm.environment.get(\"service_instance_name\") +\" exists in AAI inventory\"] = pm.response.code === 200;",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/service/{{auto_service_instance_id}}?relatedParty.id={{customer_name}}&serviceSpecification.name={{service}}",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"service",
-						"{{auto_service_instance_id}}"
-					],
-					"query": [
-						{
-							"key": "relatedParty.id",
-							"value": "{{customer_name}}"
-						},
-						{
-							"key": "serviceSpecification.name",
-							"value": "{{service}}"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Instantiate vnf",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e779f618-dd36-474f-802d-a36abdf69708",
-						"exec": [
-							"pm.test(\"Status code is 202\", function () {",
-							"    pm.response.to.have.status(202);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
-							"pm.environment.set(\"auto_vnf_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n  \"requestDetails\": {\n    \"requestInfo\": {\n      \"instanceName\": \"{{vnf_instance_name}}\",\n      \"source\": \"VID\",\n      \"suppressRollback\": false,\n      \"requestorId\": \"test\",\n\t  \"productFamilyId\": \"1234\"\n    },\n\t\"modelInfo\": {\n\t\t\"modelType\": \"vnf\",\n\t\t\"modelInvariantId\": \"{{auto_vf_invariant_uuid}}\",\n\t\t\t\"modelVersionId\": \"{{auto_vf_uuid}}\",\n\t\t\t\"modelName\": \"{{vf_name}}\",\n\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\"modelCustomizationId\": \"{{auto_vf_customization_uuid}}\",\n\t\t\t\"modelCustomizationName\": \"{{auto_vf_name_for_model}}\"\n\t\t},\n    \"requestParameters\": {\n      \"userParams\": [],\n      \"aLaCarte\": true,\n\t  \"testApi\": \"VNF_API\"\n    },\n    \"cloudConfiguration\": {\n      \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n      \"cloudOwner\": \"{{cloud_owner_name}}\",\n      \"tenantId\": \"{{tenant_id}}\"\n    },\n\t\t\"lineOfBusiness\": {\n\t\t\t\"lineOfBusinessName\": \"{{lineofbusiness}}\"\n\t\t},\n\t\t\"platform\": {\n\t\t\t\"platformName\": \"{{platform}}\"\n\t\t},\n\t\t\"relatedInstanceList\": [{\n\t\t\t\"relatedInstance\": {\n\t\t\t\t\"instanceId\": \"{{auto_service_instance_id}}\",\n\t\t\t\t\"modelInfo\": {\n\t\t\t\t\t\"modelType\": \"service\",\n\t\t\t\t\t\"modelName\": \"{{service}}\",\n\t\t\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n\t\t\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\"\n\t\t\t\t}\n\t\t\t}\n\t\t}]\n  }\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances",
-						"{{auto_service_instance_id}}",
-						"vnfs"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests after 10s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "750de5df-76ee-42c6-8f04-bfb9e1a9ea33",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_vnf_instance_id\", \"\"+jsonData.request.instanceReferences.vnfInstanceId+\"\");",
-							"tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
-							"tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vnf has been created successfully.\";",
-							""
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "15a5b018-1d8a-4326-9810-cf94a1f4d80f",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7",
-						"{{auto_so_request_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check vnf instance in inventory via AAI request",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "a08edc1f-6b8c-4a7e-91ce-6d774d0dfb1e",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var vnf_instance_found = false;",
-							"for (var i = 0; i < jsonData[\"generic-vnf\"].length; i++) { ",
-							"   if (jsonData[\"generic-vnf\"][i][\"vnf-name\"] === pm.environment.get(\"vnf_instance_name\")) {",
-							"       vnf_instance_found = true;",
-							"   }",
-							"}",
-							"tests[\"VNF Instance : \"+ pm.environment.get(\"vnf_instance_name\") +\" exists in AAI inventory\"] = vnf_instance_found === true;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/generic-vnfs",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"generic-vnfs"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "preload for VFmodule",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "62a8ef7f-7fde-423c-8b70-5f74bb6bc00b",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "0a3f6713-ba96-4971-a6f8-c2da85a3176e"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "API client"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"input\": {\n        \"request-information\": {\n            \"notification-url\": \"onap.org\",\n            \"order-number\": \"1\",\n            \"order-version\": \"1\",\n            \"request-action\": \"PreloadVNFRequest\",\n            \"request-id\": \"test\"\n        },\n        \"sdnc-request-header\": {\n            \"svc-action\": \"reserve\",\n            \"svc-notification-url\": \"http:\\/\\/onap.org:8080\\/adapters\\/rest\\/SDNCNotify\",\n            \"svc-request-id\": \"test\"\n        },\n        \"vnf-topology-information\": {\n            \"vnf-assignments\": {\n                \"availability-zones\": [],\n                \"vnf-networks\": [],\n                \"vnf-vms\": []\n            },\n            \"vnf-parameters\": [],\n            \"vnf-topology-identifier\": {\n                \"generic-vnf-name\": \"{{vnf_instance_name}}\",\n                \"generic-vnf-type\": \"{{auto_vf_name_for_model}}\",\n                \"service-type\": \"{{auto_service_instance_id}}\",\n                \"vnf-name\": \"{{vfmodule_instance_name}}\",\n                \"vnf-type\": \"{{auto_vf_module_model_name}}\"\n            }\n        }\n    }\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-sdnc}}/restconf/operations/VNF-API:preload-vnf-topology-operation",
-					"host": [
-						"{{url-sdnc}}"
-					],
-					"path": [
-						"restconf",
-						"operations",
-						"VNF-API:preload-vnf-topology-operation"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Instantiate vf-module",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "61781baf-f6d4-4229-95d0-32e85cde3e82",
-						"exec": [
-							"pm.test(\"Status code is 202\", function () {",
-							"    pm.response.to.have.status(202);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"if (responseCode.code === 202){",
-							"    pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
-							"    pm.environment.set(\"auto_vfmodule_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
-							"}"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n  \"requestDetails\": {\n    \"requestInfo\": {\n      \"instanceName\": \"{{vfmodule_instance_name}}\",\n      \"source\": \"VID\",\n      \"suppressRollback\": false,\n      \"requestorId\": \"test\"\n    },\n\t\"modelInfo\": {\n\t\t\"modelType\": \"vfModule\",\n\t\t\"modelInvariantId\": \"{{auto_vf_module_model_invariant_uuid}}\",\n\t\t\"modelVersionId\": \"{{auto_vf_module_model_uuid}}\",\n\t\t\"modelName\": \"{{auto_vf_module_model_name}}\",\n\t\t\"modelVersion\": \"1\",\n\t\t\"modelCustomizationId\": \"{{auto_vf_module_model_customization_uuid}}\",\n\t\t\"modelCustomizationName\": \"{{auto_vf_module_model_name}}\"\n\t},\n \t\"requestParameters\": {\n \t\t\"userParams\": [],\n \t\t\"testApi\": \"VNF_API\",\n \t\t\"usePreload\": true\n \t},\n    \"cloudConfiguration\": {\n      \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n      \"cloudOwner\": \"{{cloud_owner_name}}\",\n      \"tenantId\": \"{{tenant_id}}\"\n    },\n\t\t\"relatedInstanceList\": [{\n\t\t\t\"relatedInstance\": {\n\t\t\t\t\"instanceId\": \"{{auto_service_instance_id}}\",\n\t\t\t\t\"modelInfo\": {\n\t\t\t\t\t\"modelType\": \"service\",\n\t\t\t\t\t\"modelName\": \"{{service}}\",\n\t\t\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n\t\t\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\"\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t\t{\n\t\t\t\"relatedInstance\": {\n\t\t\t\t\"instanceId\": \"{{auto_vnf_instance_id}}\",\n\t\t\t\t\"modelInfo\": {\n\t\t\t\t\t\"modelType\": \"vnf\",\n\t\t\t\t\t\"modelName\": \"{{vf_name}}\",\n\t\t\t\t\t\"modelInvariantId\": \"{{auto_vf_invariant_uuid}}\",\n\t\t\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\t\t\"modelVersionId\": \"{{auto_vf_uuid}}\",\n\t\t\t\t\t\"modelCustomizationId\": \"{{auto_vf_customization_uuid}}\",\n\t\t\t\t\t\"modelCustomizationName\": \"{{auto_vf_name_for_model}}\"\n\t\t\t\t}\n\t\t\t}\n\t\t}]\n  }\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs/{{auto_vnf_instance_id}}/vfModules",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances",
-						"{{auto_service_instance_id}}",
-						"vnfs",
-						"{{auto_vnf_instance_id}}",
-						"vfModules"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests after 120s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ef3be415-7453-4d2d-91ce-de6e2df05dbe",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_vfmodule_instance_id\", \"\"+jsonData.request.instanceReferences.vfModuleInstanceId+\"\");",
-							"tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
-							"tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vf Module has been created successfully.\";"
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "8f7cbf38-cb21-45af-9648-1915c92bcb12",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7",
-						"{{auto_so_request_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check vfmodule instance in inventory via AAI request",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "81203009-3d68-426d-9491-1276983693e5",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"var vfmodule_instance_found = false;",
-							"for (var i = 0; i < jsonData[\"vf-module\"].length; i++) { ",
-							"   if (jsonData[\"vf-module\"][i][\"vf-module-name\"] === pm.environment.get(\"vfmodule_instance_name\")) {",
-							"       vfmodule_instance_found = true;",
-							"   }",
-							"}",
-							"tests[\"vfmodule Instance : \"+ pm.environment.get(\"vfmodule_instance_name\") +\" exists in AAI inventory\"] = vfmodule_instance_found === true;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/generic-vnfs/generic-vnf/{{auto_vnf_instance_id}}/vf-modules",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"generic-vnfs",
-						"generic-vnf",
-						"{{auto_vnf_instance_id}}",
-						"vf-modules"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "preload for Virtual Link",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "62a8ef7f-7fde-423c-8b70-5f74bb6bc00b",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "0a3f6713-ba96-4971-a6f8-c2da85a3176e"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "API client"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n  \"input\": {\n    \"request-information\": {\n      \"request-id\": \"postman001\",\n      \"notification-url\": \"http://so.onap.org\",\n      \"order-number\": \"postman001\",\n      \"request-sub-action\": \"SUPP\",\n      \"request-action\": \"PreloadNetworkRequest\",\n      \"source\": \"postman\",\n      \"order-version\": \"1.0\"\n    },\n    \"network-topology-information\": {\n      \"network-policy\": [],\n      \"route-table-reference\": [],\n      \"vpn-bindings\": [],\n      \"network-topology-identifier\": {\n        \"network-role\": \"integration_test_net\",\n        \"network-technology\": \"neutron\",\n        \"service-type\": \"{{service}}\",\n        \"network-name\": \"rr01\",\n        \"network-type\": \"Generic NeutronNet\"\n      },\n      \"provider-network-information\": {\n        \"is-external-network\": \"false\",\n        \"is-provider-network\": \"false\",\n        \"is-shared-network\": \"false\"\n      },\n      \"subnets\": [\n        {\n\t\t  \"subnet-name\": \"rr01\",\n\t\t  \"subnet-role\": \"OAM\",\n          \"start-address\": \"192.168.90.0\",\n          \"cidr-mask\": \"24\",\n          \"ip-version\": \"4\",\n          \"dhcp-enabled\": \"Y\",\n\t\t  \"dhcp-start-address\": \"\",\n\t\t  \"dhcp-end-address\": \"\",\n          \"gateway-address\": \"192.168.90.1\",\n\t\t  \"host-routes\":[]\n        }\n              ]\n    },\n    \"sdnc-request-header\": {\n      \"svc-action\": \"reserve\",\n      \"svc-notification-url\": \"http://so.onap.org\",\n      \"svc-request-id\": \"postman001\"\n    }\n  }\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-sdnc}}/restconf/operations/VNF-API:preload-network-topology-operation",
-					"host": [
-						"{{url-sdnc}}"
-					],
-					"path": [
-						"restconf",
-						"operations",
-						"VNF-API:preload-network-topology-operation"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Instantiate Generic Neutron Virtual Link",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "030a6341-9ba8-4dc4-bbe4-9818c34d5f1c",
-						"exec": [
-							"pm.test(\"Status code is 202\", function () {",
-							"    pm.response.to.have.status(202);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
-							"pm.environment.set(\"auto_virtual_link_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n\t\"requestDetails\": {\n\t\t\"requestInfo\": {\n\t\t\t\"instanceName\": \"{{virtual_link_instance_name}}\",\n\t\t\t\"source\": \"VID\",\n\t\t\t\"suppressRollback\": false,\n\t\t\t\"requestorId\": \"demo\"\n\t\t},\n \t\t\"modelInfo\": {\n \t\t\t\"modelType\": \"network\",\n \t\t\t\"modelInvariantId\": \"{{auto_virtual_link_invariant_uuid}}\",\n \t\t\t\"modelVersionId\": \"{{auto_virtual_link_uuid}}\",\n \t\t\t\"modelName\": \"Generic NeutronNet\",\n \t\t\t\"modelVersion\": \"1.0\",\n \t\t\t\"modelCustomizationId\": \"{{auto_virtual_link_customization_uuid}}\",\n \t\t\t\"modelCustomizationName\": \"Generic NeutronNet 0\"\n \t\t},\n    \"requestParameters\": {\n      \"userParams\": [],\n      \"aLaCarte\": true,\n\t  \"testApi\": \"VNF_API\"\n    },\n    \"cloudConfiguration\": {\n      \"cloudOwner\": \"{{cloud_owner_name}}\",\n      \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n      \"tenantId\": \"{{tenant_id}}\"\n    },\n\t\t\"lineOfBusiness\": {\n\t\t\t\"lineOfBusinessName\": \"{{lineofbusiness}}\"\n\t\t},\n\t\t\"platform\": {\n\t\t\t\"platformName\": \"{{platform}}\"\n\t\t},\n \t\t\"relatedInstanceList\": [{\n \t\t\t\"relatedInstance\": {\n \t\t\t\t\"instanceId\": \"{{auto_service_instance_id}}\",\n \t\t\t\t\"modelInfo\": {\n \t\t\t\t\t\"modelType\": \"service\",\n \t\t\t\t\t\"modelName\": \"{{service}}\",\n \t\t\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n \t\t\t\t\t\"modelVersion\": \"1.0\",\n \t\t\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\"\n \t\t\t\t}\n \t\t\t}\n \t\t}]\n  }\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/networks",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances",
-						"{{auto_service_instance_id}}",
-						"networks"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests after 10s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ef3be415-7453-4d2d-91ce-de6e2df05dbe",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_virtual_link_instance_id\", \"\"+jsonData.request.instanceReferences.networkInstanceId+\"\");",
-							"tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
-							"tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Network has been created successfully.\";"
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "8f7cbf38-cb21-45af-9648-1915c92bcb12",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7",
-						"{{auto_so_request_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET virtual link in AAI by id",
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/l3-networks/l3-network/{{auto_virtual_link_instance_id}}",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"l3-networks",
-						"l3-network",
-						"{{auto_virtual_link_instance_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET subnets of network AAI by id",
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/l3-networks/l3-network/{{auto_virtual_link_instance_id}}/subnets",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"l3-networks",
-						"l3-network",
-						"{{auto_virtual_link_instance_id}}",
-						"subnets"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO Instantiate service",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "e779f618-dd36-474f-802d-a36abdf69708",
-						"exec": [
-							"pm.test(\"Status code is 202\", function () {",
-							"    pm.response.to.have.status(202);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
-							"pm.environment.set(\"auto_service_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n\t\"requestDetails\": {\n\t\t\"requestInfo\": {\n\t\t\t\"instanceName\": \"{{service_instance_name}}\",\n\t\t\t\"source\": \"VID\",\n\t\t\t\"suppressRollback\": false,\n\t\t\t\"requestorId\": \"demo\"\n\t\t},\n\t\t\"modelInfo\": {\n\t\t\t\"modelType\": \"service\",\n\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\",\n\t\t\t\"modelName\": \"{{service}}\",\n\t\t\t\"modelVersion\": \"1.0\"\n\t\t},\n        \"cloudConfiguration\": {\n            \"tenantId\": \"{{tenant_id}}\",\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\"\n        },\n\t\t\"requestParameters\": {\n\t\t\t\"userParams\": [],\n\t\t\t\"testApi\": \"VNF_API\",\n\t\t\t\"subscriptionServiceType\": \"{{service}}\",\n\t\t\t\"aLaCarte\": true\n\t\t},\n\t\t\"subscriberInfo\": {\n\t\t\t\"globalSubscriberId\": \"{{customer_name}}\"\n\t\t},\n\t\t\"project\": {\n\t\t\t\"projectName\": \"{{project}}\"\n\t\t},\n\t\t\"owningEntity\": {\n\t\t\t\"owningEntityId\": \"{{auto_owning_entity_id}}\",\n\t\t\t\"owningEntityName\": \"{{owning_entity}}\"\n\t\t}\n\t}\n}"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests after 10s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "ef3be415-7453-4d2d-91ce-de6e2df05dbe",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_virtual_link_instance_id\", \"\"+jsonData.request.instanceReferences.networkInstanceId+\"\");",
-							"tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
-							"tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Network has been created successfully.\";"
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "8f7cbf38-cb21-45af-9648-1915c92bcb12",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7",
-						"{{auto_so_request_id}}"
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "200601a1-b07a-4a07-ba56-a3fc357e9f55",
+    "name": "10_instantiate_service_vnf_vfmodule",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "GET ExternalAPI-NBI component Status (HealthCheck)",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ddeb2e4b-2ef6-4b58-8e5c-cc202fbb232a",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var NBI_status = false;",
+              "var jsonData = pm.response.json();",
+              "",
+              "if (jsonData.status === \"ok\") {",
+              "       NBI_status = true;",
+              "}",
+              "tests[\"NBI status OK\"] = NBI_status === true;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/status",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "status"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET all service models from Service Catalog API",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "d020751d-1ca5-4c47-af33-40faea633e62",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var service_found = false;",
+              "for (var i = 0; i < jsonData.length; i++) { ",
+              "   if (jsonData[i].name === pm.environment.get(\"service\")) {",
+              "       service_found = true;",
+              "       pm.environment.set(\"auto_service_id\", \"\"+jsonData[i].id+\"\");",
+              "   }",
+              "}",
+              "tests[\"Service : \"+pm.environment.get(\"service\")+\" exists\"] = service_found === true;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/serviceSpecification",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "serviceSpecification"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET all service instances via ServiceInventory API",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "79e173a3-297e-467f-8c9b-be90035a91aa",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var service_instance_found = false;",
+              "for (var i = 0; i < jsonData.length; i++) { ",
+              "   if (jsonData[i].name === pm.environment.get(\"service_instance_name\")) {",
+              "       service_instance_found = true;",
+              "   }",
+              "}",
+              "tests[\"Service instance : \"+pm.environment.get(\"service_instance_name\")+\" does not exist\"] = service_instance_found === false;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/service?relatedParty.id={{customer_name}}",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "service"
+          ],
+          "query": [
+            {
+              "key": "relatedParty.id",
+              "value": "{{customer_name}}"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Add service instance via ServiceOrder API",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "9e3790c5-456a-44aa-9579-de3e9be2b61a",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "tests[pm.environment.get(\"externalId\")+\" exists\"] = jsonData.externalId === pm.environment.get(\"externalId\");",
+              "",
+              "pm.environment.set(\"auto_service_order_id\", jsonData.id);",
+              "    "
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n  \"externalId\": \"{{externalId}}\",\n  \"priority\": \"1\",\n  \"description\": \"{{service}} order for generic customer via Postman\",\n  \"category\": \"Consumer\",\n  \"requestedStartDate\": \"2018-04-26T08:33:37.299Z\",\n  \"requestedCompletionDate\": \"2018-04-26T08:33:37.299Z\",\n  \"relatedParty\": [\n    {\n      \"id\": \"{{customer_name}}\",\n      \"role\": \"ONAPcustomer\",\n      \"name\": \"{{customer_name}}\"\n    }\n  ],\n  \"orderItem\": [\n    {\n      \"id\": \"1\",\n      \"action\": \"add\",\n      \"service\": {\n        \"name\": \"{{service_instance_name}}\",\n        \"serviceState\": \"active\",\n        \"serviceSpecification\": {\n          \"id\": \"{{auto_service_id}}\"\n        }\n      }\n    }\n  ]\n}"
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/serviceOrder",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "serviceOrder"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET previous serviceOrder after 10s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "dc4fc1f9-cd6a-41c8-a972-06694d869384",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[pm.environment.get(\"externalId\")+\" exists\"] = jsonData.externalId === pm.environment.get(\"externalId\");",
+              "tests[\"service_order_id exists\"] = jsonData.id === pm.environment.get(\"auto_service_order_id\");",
+              "tests[\"service Order state is : \"+jsonData.state] = jsonData.state === \"completed\";",
+              "tests[\"Service Instance state is : \"+jsonData.orderItem[0].service.serviceState] = jsonData.orderItem[0].service.serviceState === \"active\";",
+              "",
+              "",
+              "if(jsonData.state == \"completed\"){",
+              "    pm.environment.set(\"auto_service_instance_id\", \"\"+jsonData.orderItem[0].service.id+\"\");",
+              "}",
+              "if (jsonData.orderMessage !== null){",
+              "    tests[\"order message is : \" +jsonData.orderMessage[0].messageInformation] = jsonData.orderMessage[0].messageInformation === \"\";",
+              "    pm.environment.set(\"auto_service_messageInformation\", \"\"+jsonData.orderMessage[0].messageInformation+\"\");",
+              "    }",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "b2473649-e045-465e-84cc-0725d83d57ed",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/serviceOrder/{{auto_service_order_id}}",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "serviceOrder",
+            "{{auto_service_order_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "1536607a-13f7-4c9a-97a6-af7f5dbc0593",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "if (jsonData.requestList.length > 0){",
+              "    tests[\"requestState is : \"+jsonData.requestList[0].request.requestStatus.requestState] = jsonData.requestList[0].request.requestStatus.requestState === \"COMPLETE\";",
+              "    tests[\"statusMessage is : \"+jsonData.requestList[0].request.requestStatus.statusMessage] = jsonData.requestList[0].request.requestStatus.statusMessage === \"Service Instance was created successfully.\";",
+              "}",
+              "else {",
+              "    tests[\"no order for that service instance\"] = true === false;",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7?filter=serviceInstanceName:EQUALS:{{service_instance_name}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7"
+          ],
+          "query": [
+            {
+              "key": "filter",
+              "value": "serviceInstanceName:EQUALS:{{service_instance_name}}"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Check service instance in inventory via NBI request",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "f1cbf2f1-1ed2-4d21-9483-46602241705d",
+            "exec": [
+              "tests[\"Service Instance : \"+ pm.environment.get(\"service_instance_name\") +\" exists in AAI inventory\"] = pm.response.code === 200;",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/service/{{auto_service_instance_id}}?relatedParty.id={{customer_name}}&serviceSpecification.name={{service}}",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "service",
+            "{{auto_service_instance_id}}"
+          ],
+          "query": [
+            {
+              "key": "relatedParty.id",
+              "value": "{{customer_name}}"
+            },
+            {
+              "key": "serviceSpecification.name",
+              "value": "{{service}}"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Instantiate vnf",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e779f618-dd36-474f-802d-a36abdf69708",
+            "exec": [
+              "pm.test(\"Status code is 202\", function () {",
+              "    pm.response.to.have.status(202);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
+              "pm.environment.set(\"auto_vnf_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n  \"requestDetails\": {\n    \"requestInfo\": {\n      \"instanceName\": \"{{vnf_instance_name}}\",\n      \"source\": \"VID\",\n      \"suppressRollback\": false,\n      \"requestorId\": \"test\",\n\t  \"productFamilyId\": \"1234\"\n    },\n\t\"modelInfo\": {\n\t\t\"modelType\": \"vnf\",\n\t\t\"modelInvariantId\": \"{{auto_vf_invariant_uuid}}\",\n\t\t\t\"modelVersionId\": \"{{auto_vf_uuid}}\",\n\t\t\t\"modelName\": \"{{vf_name}}\",\n\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\"modelCustomizationId\": \"{{auto_vf_customization_uuid}}\",\n\t\t\t\"modelCustomizationName\": \"{{auto_vf_name_for_model}}\"\n\t\t},\n    \"requestParameters\": {\n      \"userParams\": [],\n      \"aLaCarte\": true,\n\t  \"testApi\": \"VNF_API\"\n    },\n    \"cloudConfiguration\": {\n      \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n      \"cloudOwner\": \"{{cloud_owner_name}}\",\n      \"tenantId\": \"{{tenant_id}}\"\n    },\n\t\t\"lineOfBusiness\": {\n\t\t\t\"lineOfBusinessName\": \"{{lineofbusiness}}\"\n\t\t},\n\t\t\"platform\": {\n\t\t\t\"platformName\": \"{{platform}}\"\n\t\t},\n\t\t\"relatedInstanceList\": [{\n\t\t\t\"relatedInstance\": {\n\t\t\t\t\"instanceId\": \"{{auto_service_instance_id}}\",\n\t\t\t\t\"modelInfo\": {\n\t\t\t\t\t\"modelType\": \"service\",\n\t\t\t\t\t\"modelName\": \"{{service}}\",\n\t\t\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n\t\t\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\"\n\t\t\t\t}\n\t\t\t}\n\t\t}]\n  }\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances",
+            "{{auto_service_instance_id}}",
+            "vnfs"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests after 10s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "750de5df-76ee-42c6-8f04-bfb9e1a9ea33",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_vnf_instance_id\", \"\"+jsonData.request.instanceReferences.vnfInstanceId+\"\");",
+              "tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
+              "tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vnf has been created successfully.\";",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "15a5b018-1d8a-4326-9810-cf94a1f4d80f",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7",
+            "{{auto_so_request_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check vnf instance in inventory via AAI request",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "a08edc1f-6b8c-4a7e-91ce-6d774d0dfb1e",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var vnf_instance_found = false;",
+              "for (var i = 0; i < jsonData[\"generic-vnf\"].length; i++) { ",
+              "   if (jsonData[\"generic-vnf\"][i][\"vnf-name\"] === pm.environment.get(\"vnf_instance_name\")) {",
+              "       vnf_instance_found = true;",
+              "   }",
+              "}",
+              "tests[\"VNF Instance : \"+ pm.environment.get(\"vnf_instance_name\") +\" exists in AAI inventory\"] = vnf_instance_found === true;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/generic-vnfs",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "generic-vnfs"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "preload for VFmodule",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "62a8ef7f-7fde-423c-8b70-5f74bb6bc00b",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "0a3f6713-ba96-4971-a6f8-c2da85a3176e"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "API client"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"input\": {\n        \"request-information\": {\n            \"notification-url\": \"onap.org\",\n            \"order-number\": \"1\",\n            \"order-version\": \"1\",\n            \"request-action\": \"PreloadVNFRequest\",\n            \"request-id\": \"test\"\n        },\n        \"sdnc-request-header\": {\n            \"svc-action\": \"reserve\",\n            \"svc-notification-url\": \"http:\\/\\/onap.org:8080\\/adapters\\/rest\\/SDNCNotify\",\n            \"svc-request-id\": \"test\"\n        },\n        \"vnf-topology-information\": {\n            \"vnf-assignments\": {\n                \"availability-zones\": [],\n                \"vnf-networks\": [],\n                \"vnf-vms\": []\n            },\n            \"vnf-parameters\": [],\n            \"vnf-topology-identifier\": {\n                \"generic-vnf-name\": \"{{vnf_instance_name}}\",\n                \"generic-vnf-type\": \"{{auto_vf_name_for_model}}\",\n                \"service-type\": \"{{auto_service_instance_id}}\",\n                \"vnf-name\": \"{{vfmodule_instance_name}}\",\n                \"vnf-type\": \"{{auto_vf_module_model_name}}\"\n            }\n        }\n    }\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-sdnc}}/restconf/operations/VNF-API:preload-vnf-topology-operation",
+          "host": [
+            "{{url-sdnc}}"
+          ],
+          "path": [
+            "restconf",
+            "operations",
+            "VNF-API:preload-vnf-topology-operation"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Instantiate vf-module",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "61781baf-f6d4-4229-95d0-32e85cde3e82",
+            "exec": [
+              "pm.test(\"Status code is 202\", function () {",
+              "    pm.response.to.have.status(202);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "if (responseCode.code === 202){",
+              "    pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
+              "    pm.environment.set(\"auto_vfmodule_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
+              "}"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n  \"requestDetails\": {\n    \"requestInfo\": {\n      \"instanceName\": \"{{vfmodule_instance_name}}\",\n      \"source\": \"VID\",\n      \"suppressRollback\": false,\n      \"requestorId\": \"test\"\n    },\n\t\"modelInfo\": {\n\t\t\"modelType\": \"vfModule\",\n\t\t\"modelInvariantId\": \"{{auto_vf_module_model_invariant_uuid}}\",\n\t\t\"modelVersionId\": \"{{auto_vf_module_model_uuid}}\",\n\t\t\"modelName\": \"{{auto_vf_module_model_name}}\",\n\t\t\"modelVersion\": \"1\",\n\t\t\"modelCustomizationId\": \"{{auto_vf_module_model_customization_uuid}}\",\n\t\t\"modelCustomizationName\": \"{{auto_vf_module_model_name}}\"\n\t},\n \t\"requestParameters\": {\n \t\t\"userParams\": [],\n \t\t\"testApi\": \"VNF_API\",\n \t\t\"usePreload\": true\n \t},\n    \"cloudConfiguration\": {\n      \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n      \"cloudOwner\": \"{{cloud_owner_name}}\",\n      \"tenantId\": \"{{tenant_id}}\"\n    },\n\t\t\"relatedInstanceList\": [{\n\t\t\t\"relatedInstance\": {\n\t\t\t\t\"instanceId\": \"{{auto_service_instance_id}}\",\n\t\t\t\t\"modelInfo\": {\n\t\t\t\t\t\"modelType\": \"service\",\n\t\t\t\t\t\"modelName\": \"{{service}}\",\n\t\t\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n\t\t\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\"\n\t\t\t\t}\n\t\t\t}\n\t\t},\n\t\t{\n\t\t\t\"relatedInstance\": {\n\t\t\t\t\"instanceId\": \"{{auto_vnf_instance_id}}\",\n\t\t\t\t\"modelInfo\": {\n\t\t\t\t\t\"modelType\": \"vnf\",\n\t\t\t\t\t\"modelName\": \"{{vf_name}}\",\n\t\t\t\t\t\"modelInvariantId\": \"{{auto_vf_invariant_uuid}}\",\n\t\t\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\t\t\"modelVersionId\": \"{{auto_vf_uuid}}\",\n\t\t\t\t\t\"modelCustomizationId\": \"{{auto_vf_customization_uuid}}\",\n\t\t\t\t\t\"modelCustomizationName\": \"{{auto_vf_name_for_model}}\"\n\t\t\t\t}\n\t\t\t}\n\t\t}]\n  }\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs/{{auto_vnf_instance_id}}/vfModules",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances",
+            "{{auto_service_instance_id}}",
+            "vnfs",
+            "{{auto_vnf_instance_id}}",
+            "vfModules"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests after 120s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ef3be415-7453-4d2d-91ce-de6e2df05dbe",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_vfmodule_instance_id\", \"\"+jsonData.request.instanceReferences.vfModuleInstanceId+\"\");",
+              "tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
+              "tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vf Module has been created successfully.\";"
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "8f7cbf38-cb21-45af-9648-1915c92bcb12",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7",
+            "{{auto_so_request_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check vfmodule instance in inventory via AAI request",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "81203009-3d68-426d-9491-1276983693e5",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "var vfmodule_instance_found = false;",
+              "for (var i = 0; i < jsonData[\"vf-module\"].length; i++) { ",
+              "   if (jsonData[\"vf-module\"][i][\"vf-module-name\"] === pm.environment.get(\"vfmodule_instance_name\")) {",
+              "       vfmodule_instance_found = true;",
+              "   }",
+              "}",
+              "tests[\"vfmodule Instance : \"+ pm.environment.get(\"vfmodule_instance_name\") +\" exists in AAI inventory\"] = vfmodule_instance_found === true;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/generic-vnfs/generic-vnf/{{auto_vnf_instance_id}}/vf-modules",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "generic-vnfs",
+            "generic-vnf",
+            "{{auto_vnf_instance_id}}",
+            "vf-modules"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "preload for Virtual Link",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "62a8ef7f-7fde-423c-8b70-5f74bb6bc00b",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "0a3f6713-ba96-4971-a6f8-c2da85a3176e"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "API client"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n  \"input\": {\n    \"request-information\": {\n      \"request-id\": \"postman001\",\n      \"notification-url\": \"http://so.onap.org\",\n      \"order-number\": \"postman001\",\n      \"request-sub-action\": \"SUPP\",\n      \"request-action\": \"PreloadNetworkRequest\",\n      \"source\": \"postman\",\n      \"order-version\": \"1.0\"\n    },\n    \"network-topology-information\": {\n      \"network-policy\": [],\n      \"route-table-reference\": [],\n      \"vpn-bindings\": [],\n      \"network-topology-identifier\": {\n        \"network-role\": \"integration_test_net\",\n        \"network-technology\": \"neutron\",\n        \"service-type\": \"{{service}}\",\n        \"network-name\": \"rr01\",\n        \"network-type\": \"Generic NeutronNet\"\n      },\n      \"provider-network-information\": {\n        \"is-external-network\": \"false\",\n        \"is-provider-network\": \"false\",\n        \"is-shared-network\": \"false\"\n      },\n      \"subnets\": [\n        {\n\t\t  \"subnet-name\": \"rr01\",\n\t\t  \"subnet-role\": \"OAM\",\n          \"start-address\": \"192.168.90.0\",\n          \"cidr-mask\": \"24\",\n          \"ip-version\": \"4\",\n          \"dhcp-enabled\": \"Y\",\n\t\t  \"dhcp-start-address\": \"\",\n\t\t  \"dhcp-end-address\": \"\",\n          \"gateway-address\": \"192.168.90.1\",\n\t\t  \"host-routes\":[]\n        }\n              ]\n    },\n    \"sdnc-request-header\": {\n      \"svc-action\": \"reserve\",\n      \"svc-notification-url\": \"http://so.onap.org\",\n      \"svc-request-id\": \"postman001\"\n    }\n  }\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-sdnc}}/restconf/operations/VNF-API:preload-network-topology-operation",
+          "host": [
+            "{{url-sdnc}}"
+          ],
+          "path": [
+            "restconf",
+            "operations",
+            "VNF-API:preload-network-topology-operation"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Instantiate Generic Neutron Virtual Link",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "030a6341-9ba8-4dc4-bbe4-9818c34d5f1c",
+            "exec": [
+              "pm.test(\"Status code is 202\", function () {",
+              "    pm.response.to.have.status(202);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
+              "pm.environment.set(\"auto_virtual_link_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n\t\"requestDetails\": {\n\t\t\"requestInfo\": {\n\t\t\t\"instanceName\": \"{{virtual_link_instance_name}}\",\n\t\t\t\"source\": \"VID\",\n\t\t\t\"suppressRollback\": false,\n\t\t\t\"requestorId\": \"demo\"\n\t\t},\n \t\t\"modelInfo\": {\n \t\t\t\"modelType\": \"network\",\n \t\t\t\"modelInvariantId\": \"{{auto_virtual_link_invariant_uuid}}\",\n \t\t\t\"modelVersionId\": \"{{auto_virtual_link_uuid}}\",\n \t\t\t\"modelName\": \"Generic NeutronNet\",\n \t\t\t\"modelVersion\": \"1.0\",\n \t\t\t\"modelCustomizationId\": \"{{auto_virtual_link_customization_uuid}}\",\n \t\t\t\"modelCustomizationName\": \"Generic NeutronNet 0\"\n \t\t},\n    \"requestParameters\": {\n      \"userParams\": [],\n      \"aLaCarte\": true,\n\t  \"testApi\": \"VNF_API\"\n    },\n    \"cloudConfiguration\": {\n      \"cloudOwner\": \"{{cloud_owner_name}}\",\n      \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n      \"tenantId\": \"{{tenant_id}}\"\n    },\n\t\t\"lineOfBusiness\": {\n\t\t\t\"lineOfBusinessName\": \"{{lineofbusiness}}\"\n\t\t},\n\t\t\"platform\": {\n\t\t\t\"platformName\": \"{{platform}}\"\n\t\t},\n \t\t\"relatedInstanceList\": [{\n \t\t\t\"relatedInstance\": {\n \t\t\t\t\"instanceId\": \"{{auto_service_instance_id}}\",\n \t\t\t\t\"modelInfo\": {\n \t\t\t\t\t\"modelType\": \"service\",\n \t\t\t\t\t\"modelName\": \"{{service}}\",\n \t\t\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n \t\t\t\t\t\"modelVersion\": \"1.0\",\n \t\t\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\"\n \t\t\t\t}\n \t\t\t}\n \t\t}]\n  }\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/networks",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances",
+            "{{auto_service_instance_id}}",
+            "networks"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests after 10s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ef3be415-7453-4d2d-91ce-de6e2df05dbe",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_virtual_link_instance_id\", \"\"+jsonData.request.instanceReferences.networkInstanceId+\"\");",
+              "tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
+              "tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Network has been created successfully.\";"
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "8f7cbf38-cb21-45af-9648-1915c92bcb12",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7",
+            "{{auto_so_request_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET virtual link in AAI by id",
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/l3-networks/l3-network/{{auto_virtual_link_instance_id}}",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "l3-networks",
+            "l3-network",
+            "{{auto_virtual_link_instance_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET subnets of network AAI by id",
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/l3-networks/l3-network/{{auto_virtual_link_instance_id}}/subnets",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "l3-networks",
+            "l3-network",
+            "{{auto_virtual_link_instance_id}}",
+            "subnets"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO Instantiate service",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "e779f618-dd36-474f-802d-a36abdf69708",
+            "exec": [
+              "pm.test(\"Status code is 202\", function () {",
+              "    pm.response.to.have.status(202);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
+              "pm.environment.set(\"auto_service_instance_id\", \"\"+jsonData.requestReferences.instanceId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n\t\"requestDetails\": {\n\t\t\"requestInfo\": {\n\t\t\t\"instanceName\": \"{{service_instance_name}}\",\n\t\t\t\"source\": \"VID\",\n\t\t\t\"suppressRollback\": false,\n\t\t\t\"requestorId\": \"demo\"\n\t\t},\n\t\t\"modelInfo\": {\n\t\t\t\"modelType\": \"service\",\n\t\t\t\"modelInvariantId\": \"{{auto_service_invariant_uuid}}\",\n\t\t\t\"modelVersionId\": \"{{auto_service_uuid}}\",\n\t\t\t\"modelName\": \"{{service}}\",\n\t\t\t\"modelVersion\": \"1.0\"\n\t\t},\n        \"cloudConfiguration\": {\n            \"tenantId\": \"{{tenant_id}}\",\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\"\n        },\n\t\t\"requestParameters\": {\n\t\t\t\"userParams\": [],\n\t\t\t\"testApi\": \"VNF_API\",\n\t\t\t\"subscriptionServiceType\": \"{{service}}\",\n\t\t\t\"aLaCarte\": true\n\t\t},\n\t\t\"subscriberInfo\": {\n\t\t\t\"globalSubscriberId\": \"{{customer_name}}\"\n\t\t},\n\t\t\"project\": {\n\t\t\t\"projectName\": \"{{project}}\"\n\t\t},\n\t\t\"owningEntity\": {\n\t\t\t\"owningEntityId\": \"{{auto_owning_entity_id}}\",\n\t\t\t\"owningEntityName\": \"{{owning_entity}}\"\n\t\t}\n\t}\n}"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests after 10s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "ef3be415-7453-4d2d-91ce-de6e2df05dbe",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_virtual_link_instance_id\", \"\"+jsonData.request.instanceReferences.networkInstanceId+\"\");",
+              "tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
+              "tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Network has been created successfully.\";"
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "8f7cbf38-cb21-45af-9648-1915c92bcb12",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7",
+            "{{auto_so_request_id}}"
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/11_delete_instances.postman_collection.json b/test/postman/11_delete_instances.postman_collection.json
index 9fc09b6..e43ff3c 100644
--- a/test/postman/11_delete_instances.postman_collection.json
+++ b/test/postman/11_delete_instances.postman_collection.json
@@ -1,759 +1,759 @@
 {
-	"info": {
-		"_postman_id": "7e53b9c4-273b-4012-81f3-0634173626c2",
-		"name": "11_delete_instances",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "SO Delete vf-module",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "2c20c606-a034-47e0-8a66-fc4f1b8ed1c8",
-						"exec": [
-							"pm.test(\"Status code is 202\", function () {",
-							"    pm.response.to.have.status(202);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "DELETE",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n    \"requestDetails\": {\n        \"requestInfo\": {\n            \"source\": \"VID\",\n            \"requestorId\": \"test\"\n        },\n        \"modelInfo\": {\n            \"modelType\": \"vfModule\",\n            \"modelInvariantId\": \"{{auto_vf_module_model_invariant_uuid}}\",\n            \"modelVersionId\": \"{{auto_vf_module_model_uuid}}\",\n            \"modelName\": \"{{auto_vf_module_model_name}}\",\n            \"modelVersion\": \"1\",\n            \"modelCustomizationId\": \"{{auto_vf_module_model_customization_uuid}}\",\n            \"modelCustomizationName\": \"{{auto_vf_module_model_name}}\"\n        },\n        \"requestParameters\": {\n            \"testApi\": \"VNF_API\"\n        },\n        \"cloudConfiguration\": {\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n            \"tenantId\": \"{{tenant_id}}\"\n        }\n    }\n}"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs/{{auto_vnf_instance_id}}/vfModules/{{auto_vfmodule_instance_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances",
-						"{{auto_service_instance_id}}",
-						"vnfs",
-						"{{auto_vnf_instance_id}}",
-						"vfModules",
-						"{{auto_vfmodule_instance_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests after 30s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "2ca20cdd-fbb0-46a3-b6af-eb36d388448c",
-						"exec": [
-							"",
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
-							"",
-							"tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vf Module has been deleted successfully.\";"
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "0fc6bd97-ca45-4caa-bdc5-346d661a5409",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7",
-						"{{auto_so_request_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check vfmodule instance in inventory via AAI request",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "6244395e-23bd-4d4b-9f31-cd9b1e4102f6",
-						"exec": [
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"",
-							"var vfmodule_instance_found = false;",
-							"",
-							"if (pm.response.code === 200){",
-							"    for (var i = 0; i < jsonData[\"vf-module\"].length; i++) { ",
-							"        if (jsonData[\"vf-module\"][i][\"vf-module-name\"] === pm.environment.get(\"vfmodule_instance_name\")) {",
-							"            vfmodule_instance_found = true;",
-							"        }",
-							"    }",
-							"}",
-							"",
-							"",
-							"tests[\"vfmodule Instance : \"+ pm.environment.get(\"vfmodule_instance_name\") +\" no longer exists in AAI inventory\"] = vfmodule_instance_found === false;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/generic-vnfs/generic-vnf/{{auto_vnf_instance_id}}/vf-modules",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"generic-vnfs",
-						"generic-vnf",
-						"{{auto_vnf_instance_id}}",
-						"vf-modules"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO Delete vnf_instance",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "eab54e34-7898-452e-ad8e-6ac68c3efd36",
-						"exec": [
-							"pm.test(\"Status code is 202\", function () {",
-							"    pm.response.to.have.status(202);",
-							"});",
-							"var jsonData = pm.response.json();",
-							"",
-							"pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "DELETE",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n\t\"requestDetails\": {\n\t\t\"requestInfo\": {\n\t\t\t\"source\": \"VID\",\n\t\t\t\"requestorId\": \"test\"\n\t\t},\n\t\t\"modelInfo\": {\n\t\t\t\"modelType\": \"vnf\",\n\t\t\t\"modelInvariantId\": \"{{auto_vf_invariant_uuid}}\",\n\t\t\t\"modelVersionId\": \"{{auto_vf_uuid}}\",\n\t\t\t\"modelName\": \"{{vf_name}}\",\n\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\"modelCustomizationId\": \"{{auto_vf_customization_id}}\",\n\t\t\t\"modelCustomizationName\": \"{{vf_name}} 0\"\n\t\t},\n\t\t\"requestParameters\": {\n\t\t\t\"testApi\": \"VNF_API\"\n\t\t},\n        \"cloudConfiguration\": {\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n            \"tenantId\": \"{{tenant_id}}\"\n        }\n\t}\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs/{{auto_vnf_instance_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances",
-						"{{auto_service_instance_id}}",
-						"vnfs",
-						"{{auto_vnf_instance_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO Delete network",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "eab54e34-7898-452e-ad8e-6ac68c3efd36",
-						"exec": [
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "DELETE",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json",
-						"type": "text"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-						"type": "text"
-					},
-					{
-						"key": "X-ONAP-PartnerName",
-						"value": "NBI",
-						"type": "text"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "   {\n \t\"requestDetails\": {\n \t\t\"modelInfo\": {\n \t\t\t\"modelType\": \"network\"\n \t\t},\n \t\t\"requestInfo\": {\n \t\t\t\"source\": \"VID\",\n \t\t\t\"requestorId\": \"demo\"\n \t\t},\n \t\t\"requestParameters\": {\n \t\t\t\"testApi\": \"VNF_API\"\n \t\t},\n        \"cloudConfiguration\": {\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n            \"tenantId\": \"{{tenant_id}}\"\n        }\n\t}\n}\n\n"
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/networks/{{auto_virtual_link_instance_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"serviceInstantiation",
-						"v7",
-						"serviceInstances",
-						"{{auto_service_instance_id}}",
-						"networks",
-						"{{auto_virtual_link_instance_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "SO orchestrationRequests after 10s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "68a5392d-2904-416b-9cf0-a89c971aa341",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
-							"",
-							"tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vnf has been deleted successfully.\";"
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "0f9f067e-d8d4-4b69-a7eb-71f1e73b8196",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
-					"host": [
-						"{{url-so}}"
-					],
-					"path": [
-						"onap",
-						"so",
-						"infra",
-						"orchestrationRequests",
-						"v7",
-						"{{auto_so_request_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "check vnf instance in inventory via AAI request",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "851c2dff-10fb-4f6a-a346-4bab48868d3a",
-						"exec": [
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"var vnf_instance_found = false;",
-							"",
-							"if (pm.response.code === 200){",
-							"for (var i = 0; i < jsonData[\"generic-vnf\"].length; i++) { ",
-							"   if (jsonData[\"generic-vnf\"][i][\"vnf-name\"] === pm.environment.get(\"vnf_instance_name\")) {",
-							"       vnf_instance_found = true;",
-							"   }",
-							"}",
-							"}",
-							"tests[\"VNF Instance : \"+ pm.environment.get(\"vnf_instance_name\") +\" no longer exists in AAI inventory\"] = vnf_instance_found === false;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/generic-vnfs",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"generic-vnfs"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "Delete service Instance via ServiceOrder API",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "764a92a8-efb5-48f8-999a-2cf34d9364b2",
-						"exec": [
-							"pm.test(\"Status code is 201\", function () {",
-							"    pm.response.to.have.status(201);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"pm.environment.set(\"auto_service_order_id\", jsonData.id);",
-							"",
-							"",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "POST",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": "{\n  \"externalId\": \"{{externalId}}\",\n  \"priority\": \"1\",\n  \"description\": \"{{service}} ordering on generic customer via Postman\",\n  \"category\": \"Consumer\",\n  \"requestedStartDate\": \"2018-04-26T08:33:37.299Z\",\n  \"requestedCompletionDate\": \"2018-04-26T08:33:37.299Z\",\n  \"relatedParty\": [\n    {\n      \"id\": \"{{customer_name}}\",\n      \"role\": \"ONAPcustomer\",\n      \"name\": \"{{customer_name}}\"\n    }\n  ],\n  \"orderItem\": [\n    {\n      \"id\": \"1\",\n      \"action\": \"delete\",\n      \"service\": {\n        \"id\": \"{{auto_service_instance_id}}\",\n        \"serviceState\": \"active\",\n        \"serviceSpecification\": {\n          \"id\": \"{{auto_service_id}}\"\n        }\n      }\n    }\n  ]\n}"
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/serviceOrder",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"serviceOrder"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET previous serviceOrder after 10s",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "de2c349d-b58d-42ae-8454-3afc1084cef1",
-						"exec": [
-							"pm.test(\"Status code is 200\", function () {",
-							"    pm.response.to.have.status(200);",
-							"});",
-							"",
-							"var jsonData = pm.response.json();",
-							"",
-							"tests[pm.environment.get(\"externalId\")+\" exists\"] = jsonData.externalId === pm.environment.get(\"externalId\");",
-							"tests[\"service_order_id exists\"] = jsonData.id === pm.environment.get(\"auto_service_order_id\");",
-							"tests[\"service Order state is : \"+jsonData.state] = jsonData.state === \"completed\";",
-							"tests[\"Service Instance state is : \"+jsonData.orderItem[0].service.serviceState] = jsonData.orderItem[0].service.serviceState === \"active\";",
-							"",
-							"",
-							"if(jsonData.state == \"completed\"){",
-							"    pm.environment.set(\"auto_service_instance_id\", \"\"+jsonData.orderItem[0].service.id+\"\");",
-							"}",
-							"if (jsonData.orderMessage !== null){",
-							"    tests[\"order message is : \" +jsonData.orderMessage[0].messageInformation] = jsonData.orderMessage[0].messageInformation === \"\";",
-							"    pm.environment.set(\"auto_service_messageInformation\", \"\"+jsonData.orderMessage[0].messageInformation+\"\");",
-							"    }",
-							"",
-							""
-						],
-						"type": "text/javascript"
-					}
-				},
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "b9cdde4f-bf25-4922-a8c0-b378bb0b9535",
-						"exec": [
-							"  var date = new Date();",
-							"  var curDate = null;",
-							"  do {",
-							"    curDate = new Date();",
-							"  }",
-							"  while (curDate - date < 10000);"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/serviceOrder/{{auto_service_order_id}}",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"serviceOrder",
-						"{{auto_service_order_id}}"
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "GET all service instance via ServiceInventory API",
-			"event": [
-				{
-					"listen": "test",
-					"script": {
-						"id": "c7353dda-5afc-4c1c-a9d2-06036a9c984c",
-						"exec": [
-							"var jsonData = pm.response.json();",
-							"",
-							"var service_instance_found = false;",
-							"",
-							"if (pm.response.code === 200){",
-							"for (var i = 0; i < jsonData.length; i++) { ",
-							"   if (jsonData[i].name === pm.environment.get(\"service_instance_name\")) {",
-							"       service_instance_found = true;",
-							"   }",
-							"}",
-							"}",
-							"tests[pm.environment.get(\"service_instance_name\")+\" no longer in list\"] = service_instance_found === false;"
-						],
-						"type": "text/javascript"
-					}
-				}
-			],
-			"request": {
-				"method": "GET",
-				"header": [],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-nbi}}/nbi/api/v4/service?relatedParty.id={{customer_name}}",
-					"host": [
-						"{{url-nbi}}"
-					],
-					"path": [
-						"nbi",
-						"api",
-						"v4",
-						"service"
-					],
-					"query": [
-						{
-							"key": "relatedParty.id",
-							"value": "{{customer_name}}"
-						}
-					]
-				}
-			},
-			"response": []
-		},
-		{
-			"name": "DELETE Virtual Link",
-			"request": {
-				"method": "DELETE",
-				"header": [
-					{
-						"key": "Accept",
-						"value": "application/json"
-					},
-					{
-						"key": "Content-Type",
-						"value": "application/json"
-					},
-					{
-						"key": "X-FromAppId",
-						"value": "AAI"
-					},
-					{
-						"key": "X-TransactionId",
-						"value": "get_aai_subscr"
-					},
-					{
-						"key": "Authorization",
-						"value": "Basic QUFJOkFBSQ=="
-					}
-				],
-				"body": {
-					"mode": "raw",
-					"raw": ""
-				},
-				"url": {
-					"raw": "{{url-aai}}/aai/v16/network/l3-networks/l3-network/{{auto_virtual_link_instance_id}}?resource-version=1564496333018",
-					"host": [
-						"{{url-aai}}"
-					],
-					"path": [
-						"aai",
-						"v16",
-						"network",
-						"l3-networks",
-						"l3-network",
-						"{{auto_virtual_link_instance_id}}"
-					],
-					"query": [
-						{
-							"key": "resource-version",
-							"value": "1564496333018"
-						}
-					]
-				}
-			},
-			"response": []
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "7e53b9c4-273b-4012-81f3-0634173626c2",
+    "name": "11_delete_instances",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "SO Delete vf-module",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "2c20c606-a034-47e0-8a66-fc4f1b8ed1c8",
+            "exec": [
+              "pm.test(\"Status code is 202\", function () {",
+              "    pm.response.to.have.status(202);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "DELETE",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n    \"requestDetails\": {\n        \"requestInfo\": {\n            \"source\": \"VID\",\n            \"requestorId\": \"test\"\n        },\n        \"modelInfo\": {\n            \"modelType\": \"vfModule\",\n            \"modelInvariantId\": \"{{auto_vf_module_model_invariant_uuid}}\",\n            \"modelVersionId\": \"{{auto_vf_module_model_uuid}}\",\n            \"modelName\": \"{{auto_vf_module_model_name}}\",\n            \"modelVersion\": \"1\",\n            \"modelCustomizationId\": \"{{auto_vf_module_model_customization_uuid}}\",\n            \"modelCustomizationName\": \"{{auto_vf_module_model_name}}\"\n        },\n        \"requestParameters\": {\n            \"testApi\": \"VNF_API\"\n        },\n        \"cloudConfiguration\": {\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n            \"tenantId\": \"{{tenant_id}}\"\n        }\n    }\n}"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs/{{auto_vnf_instance_id}}/vfModules/{{auto_vfmodule_instance_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances",
+            "{{auto_service_instance_id}}",
+            "vnfs",
+            "{{auto_vnf_instance_id}}",
+            "vfModules",
+            "{{auto_vfmodule_instance_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests after 30s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "2ca20cdd-fbb0-46a3-b6af-eb36d388448c",
+            "exec": [
+              "",
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
+              "",
+              "tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vf Module has been deleted successfully.\";"
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "0fc6bd97-ca45-4caa-bdc5-346d661a5409",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7",
+            "{{auto_so_request_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check vfmodule instance in inventory via AAI request",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "6244395e-23bd-4d4b-9f31-cd9b1e4102f6",
+            "exec": [
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "",
+              "var vfmodule_instance_found = false;",
+              "",
+              "if (pm.response.code === 200){",
+              "    for (var i = 0; i < jsonData[\"vf-module\"].length; i++) { ",
+              "        if (jsonData[\"vf-module\"][i][\"vf-module-name\"] === pm.environment.get(\"vfmodule_instance_name\")) {",
+              "            vfmodule_instance_found = true;",
+              "        }",
+              "    }",
+              "}",
+              "",
+              "",
+              "tests[\"vfmodule Instance : \"+ pm.environment.get(\"vfmodule_instance_name\") +\" no longer exists in AAI inventory\"] = vfmodule_instance_found === false;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/generic-vnfs/generic-vnf/{{auto_vnf_instance_id}}/vf-modules",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "generic-vnfs",
+            "generic-vnf",
+            "{{auto_vnf_instance_id}}",
+            "vf-modules"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO Delete vnf_instance",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "eab54e34-7898-452e-ad8e-6ac68c3efd36",
+            "exec": [
+              "pm.test(\"Status code is 202\", function () {",
+              "    pm.response.to.have.status(202);",
+              "});",
+              "var jsonData = pm.response.json();",
+              "",
+              "pm.environment.set(\"auto_so_request_id\", \"\"+jsonData.requestReferences.requestId+\"\");",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "DELETE",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n\t\"requestDetails\": {\n\t\t\"requestInfo\": {\n\t\t\t\"source\": \"VID\",\n\t\t\t\"requestorId\": \"test\"\n\t\t},\n\t\t\"modelInfo\": {\n\t\t\t\"modelType\": \"vnf\",\n\t\t\t\"modelInvariantId\": \"{{auto_vf_invariant_uuid}}\",\n\t\t\t\"modelVersionId\": \"{{auto_vf_uuid}}\",\n\t\t\t\"modelName\": \"{{vf_name}}\",\n\t\t\t\"modelVersion\": \"1.0\",\n\t\t\t\"modelCustomizationId\": \"{{auto_vf_customization_id}}\",\n\t\t\t\"modelCustomizationName\": \"{{vf_name}} 0\"\n\t\t},\n\t\t\"requestParameters\": {\n\t\t\t\"testApi\": \"VNF_API\"\n\t\t},\n        \"cloudConfiguration\": {\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n            \"tenantId\": \"{{tenant_id}}\"\n        }\n\t}\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/vnfs/{{auto_vnf_instance_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances",
+            "{{auto_service_instance_id}}",
+            "vnfs",
+            "{{auto_vnf_instance_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO Delete network",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "eab54e34-7898-452e-ad8e-6ac68c3efd36",
+            "exec": [
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "DELETE",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json",
+            "type": "text"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+            "type": "text"
+          },
+          {
+            "key": "X-ONAP-PartnerName",
+            "value": "NBI",
+            "type": "text"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "   {\n \t\"requestDetails\": {\n \t\t\"modelInfo\": {\n \t\t\t\"modelType\": \"network\"\n \t\t},\n \t\t\"requestInfo\": {\n \t\t\t\"source\": \"VID\",\n \t\t\t\"requestorId\": \"demo\"\n \t\t},\n \t\t\"requestParameters\": {\n \t\t\t\"testApi\": \"VNF_API\"\n \t\t},\n        \"cloudConfiguration\": {\n            \"cloudOwner\": \"{{cloud_owner_name}}\",\n            \"lcpCloudRegionId\": \"{{onap_cloud_region_id}}\",\n            \"tenantId\": \"{{tenant_id}}\"\n        }\n\t}\n}\n\n"
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/serviceInstantiation/v7/serviceInstances/{{auto_service_instance_id}}/networks/{{auto_virtual_link_instance_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "serviceInstantiation",
+            "v7",
+            "serviceInstances",
+            "{{auto_service_instance_id}}",
+            "networks",
+            "{{auto_virtual_link_instance_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "SO orchestrationRequests after 10s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "68a5392d-2904-416b-9cf0-a89c971aa341",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[\"requestState is : \"+jsonData.request.requestStatus.requestState] = jsonData.request.requestStatus.requestState === \"COMPLETE\";",
+              "",
+              "tests[\"statusMessage is : \"+jsonData.request.requestStatus.statusMessage] = jsonData.request.requestStatus.statusMessage === \"Vnf has been deleted successfully.\";"
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "0f9f067e-d8d4-4b69-a7eb-71f1e73b8196",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-so}}/onap/so/infra/orchestrationRequests/v7/{{auto_so_request_id}}",
+          "host": [
+            "{{url-so}}"
+          ],
+          "path": [
+            "onap",
+            "so",
+            "infra",
+            "orchestrationRequests",
+            "v7",
+            "{{auto_so_request_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "check vnf instance in inventory via AAI request",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "851c2dff-10fb-4f6a-a346-4bab48868d3a",
+            "exec": [
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "var vnf_instance_found = false;",
+              "",
+              "if (pm.response.code === 200){",
+              "for (var i = 0; i < jsonData[\"generic-vnf\"].length; i++) { ",
+              "   if (jsonData[\"generic-vnf\"][i][\"vnf-name\"] === pm.environment.get(\"vnf_instance_name\")) {",
+              "       vnf_instance_found = true;",
+              "   }",
+              "}",
+              "}",
+              "tests[\"VNF Instance : \"+ pm.environment.get(\"vnf_instance_name\") +\" no longer exists in AAI inventory\"] = vnf_instance_found === false;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/generic-vnfs",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "generic-vnfs"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "Delete service Instance via ServiceOrder API",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "764a92a8-efb5-48f8-999a-2cf34d9364b2",
+            "exec": [
+              "pm.test(\"Status code is 201\", function () {",
+              "    pm.response.to.have.status(201);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "pm.environment.set(\"auto_service_order_id\", jsonData.id);",
+              "",
+              "",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "POST",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": "{\n  \"externalId\": \"{{externalId}}\",\n  \"priority\": \"1\",\n  \"description\": \"{{service}} ordering on generic customer via Postman\",\n  \"category\": \"Consumer\",\n  \"requestedStartDate\": \"2018-04-26T08:33:37.299Z\",\n  \"requestedCompletionDate\": \"2018-04-26T08:33:37.299Z\",\n  \"relatedParty\": [\n    {\n      \"id\": \"{{customer_name}}\",\n      \"role\": \"ONAPcustomer\",\n      \"name\": \"{{customer_name}}\"\n    }\n  ],\n  \"orderItem\": [\n    {\n      \"id\": \"1\",\n      \"action\": \"delete\",\n      \"service\": {\n        \"id\": \"{{auto_service_instance_id}}\",\n        \"serviceState\": \"active\",\n        \"serviceSpecification\": {\n          \"id\": \"{{auto_service_id}}\"\n        }\n      }\n    }\n  ]\n}"
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/serviceOrder",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "serviceOrder"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET previous serviceOrder after 10s",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "de2c349d-b58d-42ae-8454-3afc1084cef1",
+            "exec": [
+              "pm.test(\"Status code is 200\", function () {",
+              "    pm.response.to.have.status(200);",
+              "});",
+              "",
+              "var jsonData = pm.response.json();",
+              "",
+              "tests[pm.environment.get(\"externalId\")+\" exists\"] = jsonData.externalId === pm.environment.get(\"externalId\");",
+              "tests[\"service_order_id exists\"] = jsonData.id === pm.environment.get(\"auto_service_order_id\");",
+              "tests[\"service Order state is : \"+jsonData.state] = jsonData.state === \"completed\";",
+              "tests[\"Service Instance state is : \"+jsonData.orderItem[0].service.serviceState] = jsonData.orderItem[0].service.serviceState === \"active\";",
+              "",
+              "",
+              "if(jsonData.state == \"completed\"){",
+              "    pm.environment.set(\"auto_service_instance_id\", \"\"+jsonData.orderItem[0].service.id+\"\");",
+              "}",
+              "if (jsonData.orderMessage !== null){",
+              "    tests[\"order message is : \" +jsonData.orderMessage[0].messageInformation] = jsonData.orderMessage[0].messageInformation === \"\";",
+              "    pm.environment.set(\"auto_service_messageInformation\", \"\"+jsonData.orderMessage[0].messageInformation+\"\");",
+              "    }",
+              "",
+              ""
+            ],
+            "type": "text/javascript"
+          }
+        },
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "b9cdde4f-bf25-4922-a8c0-b378bb0b9535",
+            "exec": [
+              "  var date = new Date();",
+              "  var curDate = null;",
+              "  do {",
+              "    curDate = new Date();",
+              "  }",
+              "  while (curDate - date < 10000);"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/serviceOrder/{{auto_service_order_id}}",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "serviceOrder",
+            "{{auto_service_order_id}}"
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "GET all service instance via ServiceInventory API",
+      "event": [
+        {
+          "listen": "test",
+          "script": {
+            "id": "c7353dda-5afc-4c1c-a9d2-06036a9c984c",
+            "exec": [
+              "var jsonData = pm.response.json();",
+              "",
+              "var service_instance_found = false;",
+              "",
+              "if (pm.response.code === 200){",
+              "for (var i = 0; i < jsonData.length; i++) { ",
+              "   if (jsonData[i].name === pm.environment.get(\"service_instance_name\")) {",
+              "       service_instance_found = true;",
+              "   }",
+              "}",
+              "}",
+              "tests[pm.environment.get(\"service_instance_name\")+\" no longer in list\"] = service_instance_found === false;"
+            ],
+            "type": "text/javascript"
+          }
+        }
+      ],
+      "request": {
+        "method": "GET",
+        "header": [],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-nbi}}/nbi/api/v4/service?relatedParty.id={{customer_name}}",
+          "host": [
+            "{{url-nbi}}"
+          ],
+          "path": [
+            "nbi",
+            "api",
+            "v4",
+            "service"
+          ],
+          "query": [
+            {
+              "key": "relatedParty.id",
+              "value": "{{customer_name}}"
+            }
+          ]
+        }
+      },
+      "response": []
+    },
+    {
+      "name": "DELETE Virtual Link",
+      "request": {
+        "method": "DELETE",
+        "header": [
+          {
+            "key": "Accept",
+            "value": "application/json"
+          },
+          {
+            "key": "Content-Type",
+            "value": "application/json"
+          },
+          {
+            "key": "X-FromAppId",
+            "value": "AAI"
+          },
+          {
+            "key": "X-TransactionId",
+            "value": "get_aai_subscr"
+          },
+          {
+            "key": "Authorization",
+            "value": "Basic QUFJOkFBSQ=="
+          }
+        ],
+        "body": {
+          "mode": "raw",
+          "raw": ""
+        },
+        "url": {
+          "raw": "{{url-aai}}/aai/v16/network/l3-networks/l3-network/{{auto_virtual_link_instance_id}}?resource-version=1564496333018",
+          "host": [
+            "{{url-aai}}"
+          ],
+          "path": [
+            "aai",
+            "v16",
+            "network",
+            "l3-networks",
+            "l3-network",
+            "{{auto_virtual_link_instance_id}}"
+          ],
+          "query": [
+            {
+              "key": "resource-version",
+              "value": "1564496333018"
+            }
+          ]
+        }
+      },
+      "response": []
+    }
+  ]
+}
diff --git a/test/postman/12_NS_Instance.postman_collection.json b/test/postman/12_NS_Instance.postman_collection.json
index 78a1798..6bb56c6 100644
--- a/test/postman/12_NS_Instance.postman_collection.json
+++ b/test/postman/12_NS_Instance.postman_collection.json
@@ -1,234 +1,234 @@
 {
-	"info": {
-		"_postman_id": "305afb68-6632-49a7-8a6d-9d9d57699f6e",
-		"name": "Ns_Instance",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "ns_instance",
-			"item": [
-				{
-					"name": "ns_create",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\r\n    \"context\": {\r\n        \"globalCustomerId\": \"global-customer-id-test1\",\r\n        \"serviceType\": \"service-type-test1\"\r\n    },\r\n    \"csarId\": \"d5d678dc-80ef-461e-8630-d105f43b0a18\",\r\n    \"nsName\": \"ns_vsn\",\r\n    \"description\": \"description\"\r\n}"
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nslcm/v1/ns",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nslcm",
-								"v1",
-								"ns"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "ns_inst",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\r\n    \"additionalParamForNs\": {\r\n        \"sdnControllerId\": \"2\"\r\n    },\r\n    \"locationConstraints\": [{\r\n        \"vnfProfileId\": \"45711f40-3f43-415b-bb45-46e5c6940735\",\r\n        \"locationConstraints\": {\r\n            \"vimId\": \"CPE-DC_RegionOne\"\r\n        }\r\n    }]\r\n}\r\n"
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/f0b4c09f-c653-438a-b091-5218b0f806ec/instantiate",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nslcm",
-								"v1",
-								"ns",
-								"f0b4c09f-c653-438a-b091-5218b0f806ec",
-								"instantiate"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "ns_terminate",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\r\n   \"gracefulTerminationTimeout\": 600, \r\n   \"terminationType\": \"FORCEFUL\"\r\n}"
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/f0b4c09f-c653-438a-b091-5218b0f806ec/terminate",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nslcm",
-								"v1",
-								"ns",
-								"f0b4c09f-c653-438a-b091-5218b0f806ec",
-								"terminate"
-							]
-						},
-						"description": "generate：\"jobId\": \"NS-terminate_ns-f0b4c09f-c653-438a-b091-5218b0f806ec-6f12ca34-f7a2-11e8-8c7e-02bf457e51f9\"\n\ninstid：f0b4c09f-c653-438a-b091-5218b0f806ec"
-					},
-					"response": []
-				},
-				{
-					"name": "ns_delete",
-					"request": {
-						"method": "DELETE",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/f0b4c09f-c653-438a-b091-5218b0f806ec",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nslcm",
-								"v1",
-								"ns",
-								"f0b4c09f-c653-438a-b091-5218b0f806ec"
-							]
-						},
-						"description": "ns/instid:f0b4c09f-c653-438a-b091-5218b0f806ec\nInstid after ns, fill in according to the actual situation"
-					},
-					"response": []
-				},
-				{
-					"name": "ns_heal",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": "{\r\n    \"vnfInstanceId\": \"044b705c-e44d-4733-ab64-987f46d9b567\",\r\n    \"cause\": \"restartvm\",\r\n    \"additionalParams\": {\r\n      \"action\": \"restartvm\",\r\n      \"actionvminfo\": {\r\n        \"vmid\": \"1623cd25-ae6f-4880-8132-15914367e47b\",\r\n        \"vduid\": \"\",\r\n        \"vmname\": \"1623cd25-ae6f-4880-8132-15914367e47b\"\r\n      }\r\n    }"
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/5443e9f8-7993-479d-8d7a-34e422eabc8f/heal",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nslcm",
-								"v1",
-								"ns",
-								"5443e9f8-7993-479d-8d7a-34e422eabc8f",
-								"heal"
-							]
-						}
-					},
-					"response": []
-				}
-			],
-			"event": [
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "debc308f-9109-41b1-adf3-9d288b2061e6",
-						"type": "text/javascript",
-						"exec": [
-							""
-						]
-					}
-				},
-				{
-					"listen": "test",
-					"script": {
-						"id": "0a37542a-0a02-4e84-970a-f8f32b0bf713",
-						"type": "text/javascript",
-						"exec": [
-							""
-						]
-					}
-				}
-			]
-		}
-	]
+  "info": {
+    "_postman_id": "305afb68-6632-49a7-8a6d-9d9d57699f6e",
+    "name": "Ns_Instance",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "ns_instance",
+      "item": [
+        {
+          "name": "ns_create",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": "{\r\n    \"context\": {\r\n        \"globalCustomerId\": \"global-customer-id-test1\",\r\n        \"serviceType\": \"service-type-test1\"\r\n    },\r\n    \"csarId\": \"d5d678dc-80ef-461e-8630-d105f43b0a18\",\r\n    \"nsName\": \"ns_vsn\",\r\n    \"description\": \"description\"\r\n}"
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nslcm/v1/ns",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nslcm",
+                "v1",
+                "ns"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "ns_inst",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": "{\r\n    \"additionalParamForNs\": {\r\n        \"sdnControllerId\": \"2\"\r\n    },\r\n    \"locationConstraints\": [{\r\n        \"vnfProfileId\": \"45711f40-3f43-415b-bb45-46e5c6940735\",\r\n        \"locationConstraints\": {\r\n            \"vimId\": \"CPE-DC_RegionOne\"\r\n        }\r\n    }]\r\n}\r\n"
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/f0b4c09f-c653-438a-b091-5218b0f806ec/instantiate",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nslcm",
+                "v1",
+                "ns",
+                "f0b4c09f-c653-438a-b091-5218b0f806ec",
+                "instantiate"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "ns_terminate",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": "{\r\n   \"gracefulTerminationTimeout\": 600, \r\n   \"terminationType\": \"FORCEFUL\"\r\n}"
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/f0b4c09f-c653-438a-b091-5218b0f806ec/terminate",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nslcm",
+                "v1",
+                "ns",
+                "f0b4c09f-c653-438a-b091-5218b0f806ec",
+                "terminate"
+              ]
+            },
+            "description": "generate：\"jobId\": \"NS-terminate_ns-f0b4c09f-c653-438a-b091-5218b0f806ec-6f12ca34-f7a2-11e8-8c7e-02bf457e51f9\"\n\ninstid：f0b4c09f-c653-438a-b091-5218b0f806ec"
+          },
+          "response": []
+        },
+        {
+          "name": "ns_delete",
+          "request": {
+            "method": "DELETE",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/f0b4c09f-c653-438a-b091-5218b0f806ec",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nslcm",
+                "v1",
+                "ns",
+                "f0b4c09f-c653-438a-b091-5218b0f806ec"
+              ]
+            },
+            "description": "ns/instid:f0b4c09f-c653-438a-b091-5218b0f806ec\nInstid after ns, fill in according to the actual situation"
+          },
+          "response": []
+        },
+        {
+          "name": "ns_heal",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": "{\r\n    \"vnfInstanceId\": \"044b705c-e44d-4733-ab64-987f46d9b567\",\r\n    \"cause\": \"restartvm\",\r\n    \"additionalParams\": {\r\n      \"action\": \"restartvm\",\r\n      \"actionvminfo\": {\r\n        \"vmid\": \"1623cd25-ae6f-4880-8132-15914367e47b\",\r\n        \"vduid\": \"\",\r\n        \"vmname\": \"1623cd25-ae6f-4880-8132-15914367e47b\"\r\n      }\r\n    }"
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nslcm/v1/ns/5443e9f8-7993-479d-8d7a-34e422eabc8f/heal",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nslcm",
+                "v1",
+                "ns",
+                "5443e9f8-7993-479d-8d7a-34e422eabc8f",
+                "heal"
+              ]
+            }
+          },
+          "response": []
+        }
+      ],
+      "event": [
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "debc308f-9109-41b1-adf3-9d288b2061e6",
+            "type": "text/javascript",
+            "exec": [
+              ""
+            ]
+          }
+        },
+        {
+          "listen": "test",
+          "script": {
+            "id": "0a37542a-0a02-4e84-970a-f8f32b0bf713",
+            "type": "text/javascript",
+            "exec": [
+              ""
+            ]
+          }
+        }
+      ]
+    }
+  ]
 }
diff --git a/test/postman/13_Ns_package_onboard.postman_collection.json b/test/postman/13_Ns_package_onboard.postman_collection.json
index 0182c13..bb6de48 100644
--- a/test/postman/13_Ns_package_onboard.postman_collection.json
+++ b/test/postman/13_Ns_package_onboard.postman_collection.json
@@ -1,223 +1,223 @@
 {
-	"info": {
-		"_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
-		"name": "Ns_package_onboard",
-		"description": "The VFC NS package onboard",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "ns",
-			"item": [
-				{
-					"name": "msb_download",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/03c8e541-77a5-4594-b6a1-f955f6460dca/nsd_content",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors",
-								"03c8e541-77a5-4594-b6a1-f955f6460dca",
-								"nsd_content"
-							]
-						},
-						"description": "nsdinfo:03c8e541-77a5-4594-b6a1-f955f6460dca\nns_descriptors 后面跟nsdinfoid，根据实际情况填写"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_get",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/8acc4e46-08c1-46f3-a594-2910490930de",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors",
-								"8acc4e46-08c1-46f3-a594-2910490930de"
-							]
-						},
-						"description": "pick up information：\n[\n    {\n        \"id\": \"609d8ba3-9a94-4cc7-b67d-2ece3ac6e185\",\n        \"nsdId\": \"ffdddc5d-a44b-45ae-8fc3-e6551cce350f\",\n        \"nsdName\": \"vcpe\",\n        \"nsdVersion\": \"1.0.0\",\n        \"nsdDesigner\": \"ONAP\",\n        \"nsdInvariantId\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\",\n        \"vnfPkgIds\": [\n            \"386d6fb2-e1d9-4152-9bd6-606e33594ade\",\n            \"511fb4ff-6a10-4699-864f-f3e7ad9b34b3\",\n            \"39eb297c-4988-4902-9c37-55e4fd5f1c38\",\n            \"f660da08-cc7c-4a1f-8196-05d4db415e1d\",\n            \"1109773b-0cab-4f11-a11e-0cc22b1a29a3\"\n        ],\n        \"pnfdInfoIds\": [],\n        \"nestedNsdInfoIds\": [],\n        \"nsdOnboardingState\": \"ONBOARDED\",\n        \"onboardingFailureDetails\": null,\n        \"nsdOperationalState\": \"ENABLED\",\n        \"nsdUsageState\": \"NOT_IN_USE\",\n        \"userDefinedData\": {},\n        \"_links\": null\n    }\n]"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_get_one",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/8acc4e46-08c1-46f3-a594-2910490930de",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors",
-								"8acc4e46-08c1-46f3-a594-2910490930de"
-							]
-						},
-						"description": "nsdinfoid:8acc4e46-08c1-46f3-a594-2910490930de"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_delete",
-					"request": {
-						"method": "DELETE",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/03c8e541-77a5-4594-b6a1-f955f6460dca",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors",
-								"03c8e541-77a5-4594-b6a1-f955f6460dca"
-							]
-						},
-						"description": "nsinstid:03c8e541-77a5-4594-b6a1-f955f6460dca"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_create",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "formdata",
-							"formdata": [
-								{
-									"key": "userDefinedData",
-									"value": " \"key1\": \"value1\"",
-									"type": "text"
-								}
-							]
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "msb_upload",
-					"request": {
-						"method": "PUT",
-						"header": [],
-						"body": {
-							"mode": "formdata",
-							"formdata": [
-								{
-									"key": "",
-									"type": "file",
-									"src": ""
-								}
-							]
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/79ca81ec-10e0-44e4-bc85-ba968f345711/nsd_content",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors",
-								"79ca81ec-10e0-44e4-bc85-ba968f345711",
-								"nsd_content"
-							]
-						}
-					},
-					"response": []
-				}
-			]
-		}
-	]
+  "info": {
+    "_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
+    "name": "Ns_package_onboard",
+    "description": "The VFC NS package onboard",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "ns",
+      "item": [
+        {
+          "name": "msb_download",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/03c8e541-77a5-4594-b6a1-f955f6460dca/nsd_content",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors",
+                "03c8e541-77a5-4594-b6a1-f955f6460dca",
+                "nsd_content"
+              ]
+            },
+            "description": "nsdinfo:03c8e541-77a5-4594-b6a1-f955f6460dca\nns_descriptors 后面跟nsdinfoid，根据实际情况填写"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_get",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/8acc4e46-08c1-46f3-a594-2910490930de",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors",
+                "8acc4e46-08c1-46f3-a594-2910490930de"
+              ]
+            },
+            "description": "pick up information：\n[\n    {\n        \"id\": \"609d8ba3-9a94-4cc7-b67d-2ece3ac6e185\",\n        \"nsdId\": \"ffdddc5d-a44b-45ae-8fc3-e6551cce350f\",\n        \"nsdName\": \"vcpe\",\n        \"nsdVersion\": \"1.0.0\",\n        \"nsdDesigner\": \"ONAP\",\n        \"nsdInvariantId\": \"c3887fb3-d1b2-477f-86c4-fd641ee9a7cf\",\n        \"vnfPkgIds\": [\n            \"386d6fb2-e1d9-4152-9bd6-606e33594ade\",\n            \"511fb4ff-6a10-4699-864f-f3e7ad9b34b3\",\n            \"39eb297c-4988-4902-9c37-55e4fd5f1c38\",\n            \"f660da08-cc7c-4a1f-8196-05d4db415e1d\",\n            \"1109773b-0cab-4f11-a11e-0cc22b1a29a3\"\n        ],\n        \"pnfdInfoIds\": [],\n        \"nestedNsdInfoIds\": [],\n        \"nsdOnboardingState\": \"ONBOARDED\",\n        \"onboardingFailureDetails\": null,\n        \"nsdOperationalState\": \"ENABLED\",\n        \"nsdUsageState\": \"NOT_IN_USE\",\n        \"userDefinedData\": {},\n        \"_links\": null\n    }\n]"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_get_one",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/8acc4e46-08c1-46f3-a594-2910490930de",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors",
+                "8acc4e46-08c1-46f3-a594-2910490930de"
+              ]
+            },
+            "description": "nsdinfoid:8acc4e46-08c1-46f3-a594-2910490930de"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_delete",
+          "request": {
+            "method": "DELETE",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/03c8e541-77a5-4594-b6a1-f955f6460dca",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors",
+                "03c8e541-77a5-4594-b6a1-f955f6460dca"
+              ]
+            },
+            "description": "nsinstid:03c8e541-77a5-4594-b6a1-f955f6460dca"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_create",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "formdata",
+              "formdata": [
+                {
+                  "key": "userDefinedData",
+                  "value": " \"key1\": \"value1\"",
+                  "type": "text"
+                }
+              ]
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "msb_upload",
+          "request": {
+            "method": "PUT",
+            "header": [],
+            "body": {
+              "mode": "formdata",
+              "formdata": [
+                {
+                  "key": "",
+                  "type": "file",
+                  "src": ""
+                }
+              ]
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/79ca81ec-10e0-44e4-bc85-ba968f345711/nsd_content",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors",
+                "79ca81ec-10e0-44e4-bc85-ba968f345711",
+                "nsd_content"
+              ]
+            }
+          },
+          "response": []
+        }
+      ]
+    }
+  ]
 }
diff --git a/test/postman/14_Vnf_package_onboard.postman_collection.json b/test/postman/14_Vnf_package_onboard.postman_collection.json
index cec430a..1a0b109 100644
--- a/test/postman/14_Vnf_package_onboard.postman_collection.json
+++ b/test/postman/14_Vnf_package_onboard.postman_collection.json
@@ -1,185 +1,185 @@
 {
-	"info": {
-		"_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
-		"name": "Vnf_package_onboard",
-		"description": "The VFC VNF package onboard",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "VNF",
-			"item": [
-				{
-					"name": "msb_create",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json ",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "formdata",
-							"formdata": [
-								{
-									"key": "userDefinedData",
-									"value": " \"key2\": \"value2\"",
-									"type": "text"
-								}
-							]
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"vnfpkgm",
-								"v1",
-								"vnf_packages"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "msb_get",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"vnfpkgm",
-								"v1",
-								"vnf_packages"
-							]
-						},
-						"description": "pick up information：\n[\n    {\n        \"id\": \"1109773b-0cab-4f11-a11e-0cc22b1a29a3\",\n        \"vnfdId\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1101\",\n        \"vnfProductName\": \"vcpe_vbng\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"386d6fb2-e1d9-4152-9bd6-606e33594ade\",\n        \"vnfdId\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1100\",\n        \"vnfProductName\": \"vcpe_infra\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"39eb297c-4988-4902-9c37-55e4fd5f1c38\",\n        \"vnfdId\": \"0408f076-e6c0-4c82-9940-272fddbb82de\",\n        \"vnfProductName\": \"vcpe_vgmux\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"511fb4ff-6a10-4699-864f-f3e7ad9b34b3\",\n        \"vnfdId\": \"3fca3543-07f5-492f-812c-ed462e4f94f4\",\n        \"vnfProductName\": \"vcpe_vgw\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"e924a06e-2550-4700-9e72-3a2db75925ac\",\n        \"vnfdId\": null,\n        \"vnfProductName\": null,\n        \"vnfSoftwareVersion\": null,\n        \"vnfdVersion\": null,\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"CREATED\",\n        \"operationalState\": \"DISABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"userDefinedData\": {},\n        \"_links\": null\n    },\n    {\n        \"id\": \"f660da08-cc7c-4a1f-8196-05d4db415e1d\",\n        \"vnfdId\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1102\",\n        \"vnfProductName\": \"vcpe_vbrgemu\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    }\n]"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_get_one",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/03c8e541-77a5-4594-b6a1-f955f6460dca",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"ns_descriptors",
-								"03c8e541-77a5-4594-b6a1-f955f6460dca"
-							]
-						},
-						"description": "Id:03c8e541-77a5-4594-b6a1-f955f6460dca\nAccording to obtaining different vnfinstid"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_delete",
-					"request": {
-						"method": "DELETE",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/396b889f-529f-426a-97ab-65b00720b308",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"vnfpkgm",
-								"v1",
-								"vnf_packages",
-								"396b889f-529f-426a-97ab-65b00720b308"
-							]
-						},
-						"description": "Different deletion, different filling of vnfinstid"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_download",
-					"protocolProfileBehavior": {
-						"disableBodyPruning": true
-					},
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/396b889f-529f-426a-97ab-65b00720b308/package_content",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"vnfpkgm",
-								"v1",
-								"vnf_packages",
-								"396b889f-529f-426a-97ab-65b00720b308",
-								"package_content"
-							]
-						},
-						"description": "msb_download:\nget The acquired data needs to be written to the CSAR file, and there is no write operation here; \nthe vnf package tested here does not exist.\n"
-					},
-					"response": []
-				}
-			]
-		}
-	]
+  "info": {
+    "_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
+    "name": "Vnf_package_onboard",
+    "description": "The VFC VNF package onboard",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "VNF",
+      "item": [
+        {
+          "name": "msb_create",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json ",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "formdata",
+              "formdata": [
+                {
+                  "key": "userDefinedData",
+                  "value": " \"key2\": \"value2\"",
+                  "type": "text"
+                }
+              ]
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "vnfpkgm",
+                "v1",
+                "vnf_packages"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "msb_get",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "vnfpkgm",
+                "v1",
+                "vnf_packages"
+              ]
+            },
+            "description": "pick up information：\n[\n    {\n        \"id\": \"1109773b-0cab-4f11-a11e-0cc22b1a29a3\",\n        \"vnfdId\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1101\",\n        \"vnfProductName\": \"vcpe_vbng\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"386d6fb2-e1d9-4152-9bd6-606e33594ade\",\n        \"vnfdId\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1100\",\n        \"vnfProductName\": \"vcpe_infra\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"39eb297c-4988-4902-9c37-55e4fd5f1c38\",\n        \"vnfdId\": \"0408f076-e6c0-4c82-9940-272fddbb82de\",\n        \"vnfProductName\": \"vcpe_vgmux\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"511fb4ff-6a10-4699-864f-f3e7ad9b34b3\",\n        \"vnfdId\": \"3fca3543-07f5-492f-812c-ed462e4f94f4\",\n        \"vnfProductName\": \"vcpe_vgw\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    },\n    {\n        \"id\": \"e924a06e-2550-4700-9e72-3a2db75925ac\",\n        \"vnfdId\": null,\n        \"vnfProductName\": null,\n        \"vnfSoftwareVersion\": null,\n        \"vnfdVersion\": null,\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"CREATED\",\n        \"operationalState\": \"DISABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"userDefinedData\": {},\n        \"_links\": null\n    },\n    {\n        \"id\": \"f660da08-cc7c-4a1f-8196-05d4db415e1d\",\n        \"vnfdId\": \"b1bb0ce7-2222-4fa7-95ed-4840d70a1102\",\n        \"vnfProductName\": \"vcpe_vbrgemu\",\n        \"vnfSoftwareVersion\": \"1.0.0\",\n        \"vnfdVersion\": \"1.0\",\n        \"softwareImages\": null,\n        \"additionalArtifacts\": null,\n        \"onboardingState\": \"ONBOARDED\",\n        \"operationalState\": \"ENABLED\",\n        \"usageState\": \"NOT_IN_USE\",\n        \"_links\": null\n    }\n]"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_get_one",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/ns_descriptors/03c8e541-77a5-4594-b6a1-f955f6460dca",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "ns_descriptors",
+                "03c8e541-77a5-4594-b6a1-f955f6460dca"
+              ]
+            },
+            "description": "Id:03c8e541-77a5-4594-b6a1-f955f6460dca\nAccording to obtaining different vnfinstid"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_delete",
+          "request": {
+            "method": "DELETE",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/396b889f-529f-426a-97ab-65b00720b308",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "vnfpkgm",
+                "v1",
+                "vnf_packages",
+                "396b889f-529f-426a-97ab-65b00720b308"
+              ]
+            },
+            "description": "Different deletion, different filling of vnfinstid"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_download",
+          "protocolProfileBehavior": {
+            "disableBodyPruning": true
+          },
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {},
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/396b889f-529f-426a-97ab-65b00720b308/package_content",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "vnfpkgm",
+                "v1",
+                "vnf_packages",
+                "396b889f-529f-426a-97ab-65b00720b308",
+                "package_content"
+              ]
+            },
+            "description": "msb_download:\nget The acquired data needs to be written to the CSAR file, and there is no write operation here; \nthe vnf package tested here does not exist.\n"
+          },
+          "response": []
+        }
+      ]
+    }
+  ]
 }
diff --git a/test/postman/15_Pnf_package_onboard.postman_collection.json b/test/postman/15_Pnf_package_onboard.postman_collection.json
index 798a780..bb8b3d8 100644
--- a/test/postman/15_Pnf_package_onboard.postman_collection.json
+++ b/test/postman/15_Pnf_package_onboard.postman_collection.json
@@ -1,244 +1,244 @@
 {
-	"info": {
-		"_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
-		"name": "Pnf_package_onboard",
-		"description": "The VFC pnf package onboard",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "PNF",
-			"item": [
-				{
-					"name": "msb_create",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "formdata",
-							"formdata": [
-								{
-									"key": "userDefinedData",
-									"value": " \"key3\": \"value3\"",
-									"type": "text"
-								}
-							]
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"pnf_descriptors"
-							]
-						},
-						"description": "get data：\n{\n    \"id\": \"844d254e-5dc8-4a28-82a8-694b6a60bee3\",\n    \"pnfdOnboardingState\": \"CREATED\",\n    \"pnfdUsageState\": \"NOT_IN_USE\",\n    \"userDefinedData\": {},\n    \"_links\": null\n}"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_get_one",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors/5478150b-493c-4a66-a808-05387ebab874",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"pnf_descriptors",
-								"5478150b-493c-4a66-a808-05387ebab874"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "msb_get",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"pnf_descriptors"
-							]
-						},
-						"description": "get data：\n[\n    {\n        \"id\": \"844d254e-5dc8-4a28-82a8-694b6a60bee3\",\n        \"pnfdId\": null,\n        \"pnfdName\": null,\n        \"pnfdVersion\": null,\n        \"pnfdProvider\": null,\n        \"pnfdInvariantId\": null,\n        \"pnfdOnboardingState\": \"CREATED\",\n        \"onboardingFailureDetails\": null,\n        \"pnfdUsageState\": \"NOT_IN_USE\",\n        \"userDefinedData\": {},\n        \"_links\": null\n    }\n]"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_delete",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors/03c39754-46e7-44bd-ad4a-9a6de771d8bd",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"nsd",
-								"v1",
-								"pnf_descriptors",
-								"03c39754-46e7-44bd-ad4a-9a6de771d8bd"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "msb_upload",
-					"request": {
-						"method": "PUT",
-						"header": [],
-						"body": {
-							"mode": "formdata",
-							"formdata": [
-								{
-									"key": "",
-									"type": "file",
-									"src": ""
-								}
-							]
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/38037a12-a0d4-4aa4-ac50-cd6b05ce0b24/package_content",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"vnfpkgm",
-								"v1",
-								"vnf_packages",
-								"38037a12-a0d4-4aa4-ac50-cd6b05ce0b24",
-								"package_content"
-							]
-						},
-						"description": "Invalid vnf package, need to change"
-					},
-					"response": []
-				},
-				{
-					"name": "msb_download",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/396b889f-529f-426a-97ab-65b00720b308/package_content",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"vnfpkgm",
-								"v1",
-								"vnf_packages",
-								"396b889f-529f-426a-97ab-65b00720b308",
-								"package_content"
-							]
-						},
-						"description": "The acquired data needs to be written to the CSAR file. Not added here. Get data only"
-					},
-					"response": []
-				}
-			],
-			"event": [
-				{
-					"listen": "prerequest",
-					"script": {
-						"id": "7ed5956a-ebaa-4de8-b2d2-a18027de85f7",
-						"type": "text/javascript",
-						"exec": [
-							""
-						]
-					}
-				},
-				{
-					"listen": "test",
-					"script": {
-						"id": "d9830571-314d-49ee-a2a8-8be045a51469",
-						"type": "text/javascript",
-						"exec": [
-							""
-						]
-					}
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
+    "name": "Pnf_package_onboard",
+    "description": "The VFC pnf package onboard",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "PNF",
+      "item": [
+        {
+          "name": "msb_create",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "formdata",
+              "formdata": [
+                {
+                  "key": "userDefinedData",
+                  "value": " \"key3\": \"value3\"",
+                  "type": "text"
+                }
+              ]
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "pnf_descriptors"
+              ]
+            },
+            "description": "get data：\n{\n    \"id\": \"844d254e-5dc8-4a28-82a8-694b6a60bee3\",\n    \"pnfdOnboardingState\": \"CREATED\",\n    \"pnfdUsageState\": \"NOT_IN_USE\",\n    \"userDefinedData\": {},\n    \"_links\": null\n}"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_get_one",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors/5478150b-493c-4a66-a808-05387ebab874",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "pnf_descriptors",
+                "5478150b-493c-4a66-a808-05387ebab874"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "msb_get",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "pnf_descriptors"
+              ]
+            },
+            "description": "get data：\n[\n    {\n        \"id\": \"844d254e-5dc8-4a28-82a8-694b6a60bee3\",\n        \"pnfdId\": null,\n        \"pnfdName\": null,\n        \"pnfdVersion\": null,\n        \"pnfdProvider\": null,\n        \"pnfdInvariantId\": null,\n        \"pnfdOnboardingState\": \"CREATED\",\n        \"onboardingFailureDetails\": null,\n        \"pnfdUsageState\": \"NOT_IN_USE\",\n        \"userDefinedData\": {},\n        \"_links\": null\n    }\n]"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_delete",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/nsd/v1/pnf_descriptors/03c39754-46e7-44bd-ad4a-9a6de771d8bd",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "nsd",
+                "v1",
+                "pnf_descriptors",
+                "03c39754-46e7-44bd-ad4a-9a6de771d8bd"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "msb_upload",
+          "request": {
+            "method": "PUT",
+            "header": [],
+            "body": {
+              "mode": "formdata",
+              "formdata": [
+                {
+                  "key": "",
+                  "type": "file",
+                  "src": ""
+                }
+              ]
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/38037a12-a0d4-4aa4-ac50-cd6b05ce0b24/package_content",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "vnfpkgm",
+                "v1",
+                "vnf_packages",
+                "38037a12-a0d4-4aa4-ac50-cd6b05ce0b24",
+                "package_content"
+              ]
+            },
+            "description": "Invalid vnf package, need to change"
+          },
+          "response": []
+        },
+        {
+          "name": "msb_download",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/vnfpkgm/v1/vnf_packages/396b889f-529f-426a-97ab-65b00720b308/package_content",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "vnfpkgm",
+                "v1",
+                "vnf_packages",
+                "396b889f-529f-426a-97ab-65b00720b308",
+                "package_content"
+              ]
+            },
+            "description": "The acquired data needs to be written to the CSAR file. Not added here. Get data only"
+          },
+          "response": []
+        }
+      ],
+      "event": [
+        {
+          "listen": "prerequest",
+          "script": {
+            "id": "7ed5956a-ebaa-4de8-b2d2-a18027de85f7",
+            "type": "text/javascript",
+            "exec": [
+              ""
+            ]
+          }
+        },
+        {
+          "listen": "test",
+          "script": {
+            "id": "d9830571-314d-49ee-a2a8-8be045a51469",
+            "type": "text/javascript",
+            "exec": [
+              ""
+            ]
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/postman/16_Catalog_package_onboard.postman_collection.json b/test/postman/16_Catalog_package_onboard.postman_collection.json
index 70e7ed9..6f52edf 100644
--- a/test/postman/16_Catalog_package_onboard.postman_collection.json
+++ b/test/postman/16_Catalog_package_onboard.postman_collection.json
@@ -1,163 +1,163 @@
 {
-	"info": {
-		"_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
-		"name": "Catalog_package_onboard",
-		"description": "The VFC CATALOG package onboard",
-		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
-	},
-	"item": [
-		{
-			"name": "catalog",
-			"item": [
-				{
-					"name": "nspackage_rc_get",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/catalog/v1/nspackages",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"catalog",
-								"v1",
-								"nspackages"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "nspackage_rc_post",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json ",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/catalog/v1/nspackages/4a43c1d7-29e9-4b67-968d-aa62c4562286",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"catalog",
-								"v1",
-								"nspackages",
-								"4a43c1d7-29e9-4b67-968d-aa62c4562286"
-							]
-						},
-						"description": "Data is csarid. This test failed due to environmental problems. Casrid is just looking for it. Need to be replaced during actual test"
-					},
-					"response": []
-				},
-				{
-					"name": "nfpackages_rc_get",
-					"request": {
-						"method": "GET",
-						"header": [],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/catalog/v1/api/catalog/v1/vnfpackages",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"catalog",
-								"v1",
-								"api",
-								"catalog",
-								"v1",
-								"vnfpackages"
-							]
-						}
-					},
-					"response": []
-				},
-				{
-					"name": "nfpackages_rc_post",
-					"request": {
-						"method": "POST",
-						"header": [
-							{
-								"key": "content-type",
-								"value": " application/json ",
-								"type": "text"
-							},
-							{
-								"key": "accept",
-								"value": " application/json",
-								"type": "text"
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": ""
-						},
-						"url": {
-							"raw": "http://172.30.3.104:30280/api/catalog/v1/api/catalog/v1/vnfpackages/4a43c1d7-29e9-4b67-968d-aa62c4562286",
-							"protocol": "http",
-							"host": [
-								"172",
-								"30",
-								"3",
-								"104"
-							],
-							"port": "30280",
-							"path": [
-								"api",
-								"catalog",
-								"v1",
-								"api",
-								"catalog",
-								"v1",
-								"vnfpackages",
-								"4a43c1d7-29e9-4b67-968d-aa62c4562286"
-							]
-						},
-						"description": "The environment failed the test, and casrid was replaced according to the actual situation. Data is csarid"
-					},
-					"response": []
-				}
-			]
-		}
-	]
-}
\ No newline at end of file
+  "info": {
+    "_postman_id": "ce6ead69-bd22-4d59-b711-d5acf1afd243",
+    "name": "Catalog_package_onboard",
+    "description": "The VFC CATALOG package onboard",
+    "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
+  },
+  "item": [
+    {
+      "name": "catalog",
+      "item": [
+        {
+          "name": "nspackage_rc_get",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/catalog/v1/nspackages",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "catalog",
+                "v1",
+                "nspackages"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "nspackage_rc_post",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json ",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/catalog/v1/nspackages/4a43c1d7-29e9-4b67-968d-aa62c4562286",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "catalog",
+                "v1",
+                "nspackages",
+                "4a43c1d7-29e9-4b67-968d-aa62c4562286"
+              ]
+            },
+            "description": "Data is csarid. This test failed due to environmental problems. Casrid is just looking for it. Need to be replaced during actual test"
+          },
+          "response": []
+        },
+        {
+          "name": "nfpackages_rc_get",
+          "request": {
+            "method": "GET",
+            "header": [],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/catalog/v1/api/catalog/v1/vnfpackages",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "catalog",
+                "v1",
+                "api",
+                "catalog",
+                "v1",
+                "vnfpackages"
+              ]
+            }
+          },
+          "response": []
+        },
+        {
+          "name": "nfpackages_rc_post",
+          "request": {
+            "method": "POST",
+            "header": [
+              {
+                "key": "content-type",
+                "value": " application/json ",
+                "type": "text"
+              },
+              {
+                "key": "accept",
+                "value": " application/json",
+                "type": "text"
+              }
+            ],
+            "body": {
+              "mode": "raw",
+              "raw": ""
+            },
+            "url": {
+              "raw": "http://172.30.3.104:30280/api/catalog/v1/api/catalog/v1/vnfpackages/4a43c1d7-29e9-4b67-968d-aa62c4562286",
+              "protocol": "http",
+              "host": [
+                "172",
+                "30",
+                "3",
+                "104"
+              ],
+              "port": "30280",
+              "path": [
+                "api",
+                "catalog",
+                "v1",
+                "api",
+                "catalog",
+                "v1",
+                "vnfpackages",
+                "4a43c1d7-29e9-4b67-968d-aa62c4562286"
+              ]
+            },
+            "description": "The environment failed the test, and casrid was replaced according to the actual situation. Data is csarid"
+          },
+          "response": []
+        }
+      ]
+    }
+  ]
+}
diff --git a/test/postman/globals.postman_globals.json b/test/postman/globals.postman_globals.json
index adf368f..071585b 100644
--- a/test/postman/globals.postman_globals.json
+++ b/test/postman/globals.postman_globals.json
@@ -1,8 +1,8 @@
 {
-	"id": "146e52f0-fd32-4814-8e58-8a3c0f4d5eb7",
-	"values": [],
-	"name": "My Workspace Globals",
-	"_postman_variable_scope": "globals",
-	"_postman_exported_at": "2019-10-22T09:09:26.620Z",
-	"_postman_exported_using": "Postman/6.7.5"
-}
\ No newline at end of file
+  "id": "146e52f0-fd32-4814-8e58-8a3c0f4d5eb7",
+  "values": [],
+  "name": "My Workspace Globals",
+  "_postman_variable_scope": "globals",
+  "_postman_exported_at": "2019-10-22T09:09:26.620Z",
+  "_postman_exported_using": "Postman/6.7.5"
+}
diff --git a/test/postman/integration_test_urls.postman_environment.json b/test/postman/integration_test_urls.postman_environment.json
index 033f37e..ca5af22 100644
--- a/test/postman/integration_test_urls.postman_environment.json
+++ b/test/postman/integration_test_urls.postman_environment.json
@@ -1,379 +1,379 @@
 {
-	"id": "0ab0cae5-3627-447a-a322-aca5a6e764b0",
-	"name": "integration_test_urls",
-	"values": [
-		{
-			"key": "url-sdc",
-			"value": "https://sdc.api.be.simpledemo.onap.org:30204",
-			"enabled": true
-		},
-		{
-			"key": "url-sdc2",
-			"value": "https://sdc.api.fe.simpledemo.onap.org:30207",
-			"enabled": true
-		},
-		{
-			"key": "url-vid",
-			"value": "https://vid.api.simpledemo.onap.org:30200",
-			"enabled": true
-		},
-		{
-			"key": "url-aai",
-			"value": "https://aai.api.sparky.simpledemo.onap.org:30233",
-			"enabled": true
-		},
-		{
-			"key": "url-sdnc",
-			"value": "https://sdnc.api.simpledemo.onap.org:30267",
-			"enabled": true
-		},
-		{
-			"key": "url-nbi",
-			"value": "http://nbi.api.simpledemo.onap.org:30274",
-			"enabled": true
-		},
-		{
-			"key": "url-so",
-			"value": "http://so.api.simpledemo.onap.org:30277",
-			"enabled": true
-		},
-		{
-			"key": "vendor_name",
-			"value": "integration_test_vendor",
-			"enabled": true
-		},
-		{
-			"key": "vsp_name",
-			"value": "integration_test_VSP_ubuntu16_3",
-			"enabled": true
-		},
-		{
-			"key": "vf_name",
-			"value": "integration_test_VF_ubuntu16_2",
-			"enabled": true
-		},
-		{
-			"key": "service",
-			"value": "integration_test_service_ubuntu16",
-			"enabled": true
-		},
-		{
-			"key": "virtual_link_type",
-			"value": "Generic NeutronNet",
-			"enabled": true
-		},
-		{
-			"key": "owning_entity_name",
-			"value": "OE-Generic",
-			"enabled": true
-		},
-		{
-			"key": "customer_name",
-			"value": "integration_test_customer",
-			"enabled": true
-		},
-		{
-			"key": "complex_name",
-			"value": "integration_test_complex",
-			"enabled": true
-		},
-		{
-			"key": "cloud_owner_name",
-			"value": "cloudOwner",
-			"enabled": true
-		},
-		{
-			"key": "onap_cloud_region_id",
-			"value": "RegionOne",
-			"enabled": true
-		},
-		{
-			"key": "tenant_id",
-			"value": "dd8fce79e74a4989a6be6b6c5e55acef",
-			"enabled": true
-		},
-		{
-			"key": "service_instance_name",
-			"value": "integration_test_service_instance_001",
-			"enabled": true
-		},
-		{
-			"key": "vnf_instance_name",
-			"value": "integration_test_vnf_instance_002",
-			"enabled": true
-		},
-		{
-			"key": "vfmodule_instance_name",
-			"value": "integration_test_vfmodule_002",
-			"enabled": true
-		},
-		{
-			"key": "availability_zone_name",
-			"value": "brittany",
-			"enabled": true
-		},
-		{
-			"key": "hypervisor_type",
-			"value": "KVM",
-			"enabled": true
-		},
-		{
-			"key": "platform",
-			"value": "integration_test_platform",
-			"enabled": true
-		},
-		{
-			"key": "project",
-			"value": "integration_test_project",
-			"enabled": true
-		},
-		{
-			"key": "lineofbusiness",
-			"value": "integration_test_LOB",
-			"enabled": true
-		},
-		{
-			"key": "tenant_name",
-			"value": "openlab-vnfs",
-			"enabled": true
-		},
-		{
-			"key": "externalId",
-			"value": "BSS-order-001",
-			"enabled": true
-		},
-		{
-			"key": "openstack_region_id",
-			"value": "RegionOne",
-			"enabled": true
-		},
-		{
-			"key": "cloud_type",
-			"value": "openstack",
-			"enabled": true
-		},
-		{
-			"key": "cloud_region_version",
-			"value": "titanium_cloud",
-			"enabled": true
-		},
-		{
-			"key": "keystone_url",
-			"value": "",
-			"enabled": true
-		},
-		{
-			"key": "user_name",
-			"value": "",
-			"enabled": true
-		},
-		{
-			"key": "keystone_password",
-			"value": "",
-			"enabled": true
-		},
-		{
-			"key": "random_uuid",
-			"value": "",
-			"enabled": true
-		},
-		{
-			"key": "virtual_link_instance_name",
-			"value": "integration_test_vl_instance_01",
-			"enabled": true
-		},
-		{
-			"key": "service_name_macro",
-			"value": "integration_test_service_macro_ubuntu16",
-			"enabled": true
-		},
-		{
-			"key": "auto_vendor_id",
-			"value": "f77a3788d63444cd81368ecab410b95a",
-			"enabled": true
-		},
-		{
-			"key": "auto_vendor_version_id",
-			"value": "309bdd191bab465a8d27d0332d639d5e",
-			"enabled": true
-		},
-		{
-			"key": "auto_vsp_id",
-			"value": "dbdcd699dfe74b68b8d6b6da1eb7e0b5",
-			"enabled": true
-		},
-		{
-			"key": "auto_vsp_version_id",
-			"value": "8c72a115f91644e5b21737752b637b96",
-			"enabled": true
-		},
-		{
-			"key": "auto_vsp_version_name",
-			"value": "1.0",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_invariant_uuid",
-			"value": "9b06ebbf-8e4b-4941-bc76-2881d1684084",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_unique_id",
-			"value": "1bd19365-99c5-4e44-9d50-af212b3df0a3",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_uuid",
-			"value": "8bfc1d89-5735-448f-a47e-20979adff87d",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_new_unique_id",
-			"value": "1bd19365-99c5-4e44-9d50-af212b3df0a3",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_invariant_uuid",
-			"value": "9f84a760-d0da-4f85-9321-f85ef0e3bb7a",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_unique_id",
-			"value": "a9b9158b-72a0-48c1-ad37-881418c95736",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_uuid",
-			"value": "b45fa356-02b9-445c-893c-2ab505be5b1f",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_customization_uuid",
-			"value": "4a284697-5318-42e9-8084-32354e792cc2",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_name_for_model",
-			"value": "integration_test_VF_ubuntu16_2 0",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_invariant_uuid",
-			"value": "f8337441-a19b-41f6-94a4-2a53d9b612f0",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_uuid",
-			"value": "c3b97017-de13-4843-b1fe-7e8c44e50d76",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_unique_id",
-			"value": "bc5b779d-55b7-4fd7-9618-e29388f464b8",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_customization_uuid",
-			"value": "4d4c2084-77f9-491e-ba28-1188ef550578",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_name_for_model",
-			"value": "Generic NeutronNet 0",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_new_unique_id",
-			"value": "5b18e896-57e3-4148-a833-7545c3873175",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_module_model_customization_name",
-			"value": "IntegrationTestVfUbuntu162..base_ubuntu16..module-0",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_module_model_customization_uuid",
-			"value": "470956aa-b739-4cdd-b114-7ce032f65b18",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_module_model_invariant_uuid",
-			"value": "273bef63-1f26-4b14-91e0-003fa203ead2",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_module_model_name",
-			"value": "IntegrationTestVfUbuntu162..base_ubuntu16..module-0",
-			"enabled": true
-		},
-		{
-			"key": "auto_vf_module_model_uuid",
-			"value": "7cdf75de-ff3c-4a7d-a7e0-ecbc00693e8e",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_model_customization_uuid",
-			"value": "4d4c2084-77f9-491e-ba28-1188ef550578",
-			"enabled": true
-		},
-		{
-			"key": "auto_distribution_id",
-			"value": "bc5e4a16-e8d4-48e5-a4d9-47dc8117205d",
-			"enabled": true
-		},
-		{
-			"key": "auto_customer_id",
-			"value": "integration_test_customer",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_invariantUUID",
-			"value": "585de80a-d274-45dc-901a-0e598a91124c",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_resource_version",
-			"value": "1571751308981",
-			"enabled": true
-		},
-		{
-			"key": "auto_owning_entity_id",
-			"value": "8874891f-5120-4b98-b452-46284513958d",
-			"enabled": true
-		},
-		{
-			"key": "auto_service_instance_id",
-			"value": "7d550d9e-e1c4-4a21-a2bb-1c3ced8a8722",
-			"enabled": true
-		},
-		{
-			"key": "auto_so_request_id",
-			"value": "8e6d4175-ec6b-4bc4-80e6-f99c41bd3334",
-			"enabled": true
-		},
-		{
-			"key": "auto_virtual_link_instance_id",
-			"value": "undefined",
-			"enabled": true
-		},
-		{
-			"key": "auto_vnf_instance_id",
-			"value": "9764c2af-e4b0-413d-80cd-b65014ea0926",
-			"enabled": true
-		},
-		{
-			"key": "auto_vfmodule_instance_id",
-			"value": "87c9a613-e8bb-4546-a37a-d7d1d3dc62bd",
-			"enabled": true
-		},
-		{
-			"key": "owning_entity_id",
-			"value": "8874891f-5120-4b98-b452-46284513958d",
-			"enabled": true
-		}
-	],
-	"_postman_variable_scope": "environment",
-	"_postman_exported_at": "2019-12-12T16:38:37.983Z",
-	"_postman_exported_using": "Postman/7.13.0"
-}
\ No newline at end of file
+  "id": "0ab0cae5-3627-447a-a322-aca5a6e764b0",
+  "name": "integration_test_urls",
+  "values": [
+    {
+      "key": "url-sdc",
+      "value": "https://sdc.api.be.simpledemo.onap.org:30204",
+      "enabled": true
+    },
+    {
+      "key": "url-sdc2",
+      "value": "https://sdc.api.fe.simpledemo.onap.org:30207",
+      "enabled": true
+    },
+    {
+      "key": "url-vid",
+      "value": "https://vid.api.simpledemo.onap.org:30200",
+      "enabled": true
+    },
+    {
+      "key": "url-aai",
+      "value": "https://aai.api.sparky.simpledemo.onap.org:30233",
+      "enabled": true
+    },
+    {
+      "key": "url-sdnc",
+      "value": "https://sdnc.api.simpledemo.onap.org:30267",
+      "enabled": true
+    },
+    {
+      "key": "url-nbi",
+      "value": "http://nbi.api.simpledemo.onap.org:30274",
+      "enabled": true
+    },
+    {
+      "key": "url-so",
+      "value": "http://so.api.simpledemo.onap.org:30277",
+      "enabled": true
+    },
+    {
+      "key": "vendor_name",
+      "value": "integration_test_vendor",
+      "enabled": true
+    },
+    {
+      "key": "vsp_name",
+      "value": "integration_test_VSP_ubuntu16_3",
+      "enabled": true
+    },
+    {
+      "key": "vf_name",
+      "value": "integration_test_VF_ubuntu16_2",
+      "enabled": true
+    },
+    {
+      "key": "service",
+      "value": "integration_test_service_ubuntu16",
+      "enabled": true
+    },
+    {
+      "key": "virtual_link_type",
+      "value": "Generic NeutronNet",
+      "enabled": true
+    },
+    {
+      "key": "owning_entity_name",
+      "value": "OE-Generic",
+      "enabled": true
+    },
+    {
+      "key": "customer_name",
+      "value": "integration_test_customer",
+      "enabled": true
+    },
+    {
+      "key": "complex_name",
+      "value": "integration_test_complex",
+      "enabled": true
+    },
+    {
+      "key": "cloud_owner_name",
+      "value": "cloudOwner",
+      "enabled": true
+    },
+    {
+      "key": "onap_cloud_region_id",
+      "value": "RegionOne",
+      "enabled": true
+    },
+    {
+      "key": "tenant_id",
+      "value": "dd8fce79e74a4989a6be6b6c5e55acef",
+      "enabled": true
+    },
+    {
+      "key": "service_instance_name",
+      "value": "integration_test_service_instance_001",
+      "enabled": true
+    },
+    {
+      "key": "vnf_instance_name",
+      "value": "integration_test_vnf_instance_002",
+      "enabled": true
+    },
+    {
+      "key": "vfmodule_instance_name",
+      "value": "integration_test_vfmodule_002",
+      "enabled": true
+    },
+    {
+      "key": "availability_zone_name",
+      "value": "brittany",
+      "enabled": true
+    },
+    {
+      "key": "hypervisor_type",
+      "value": "KVM",
+      "enabled": true
+    },
+    {
+      "key": "platform",
+      "value": "integration_test_platform",
+      "enabled": true
+    },
+    {
+      "key": "project",
+      "value": "integration_test_project",
+      "enabled": true
+    },
+    {
+      "key": "lineofbusiness",
+      "value": "integration_test_LOB",
+      "enabled": true
+    },
+    {
+      "key": "tenant_name",
+      "value": "openlab-vnfs",
+      "enabled": true
+    },
+    {
+      "key": "externalId",
+      "value": "BSS-order-001",
+      "enabled": true
+    },
+    {
+      "key": "openstack_region_id",
+      "value": "RegionOne",
+      "enabled": true
+    },
+    {
+      "key": "cloud_type",
+      "value": "openstack",
+      "enabled": true
+    },
+    {
+      "key": "cloud_region_version",
+      "value": "titanium_cloud",
+      "enabled": true
+    },
+    {
+      "key": "keystone_url",
+      "value": "",
+      "enabled": true
+    },
+    {
+      "key": "user_name",
+      "value": "",
+      "enabled": true
+    },
+    {
+      "key": "keystone_password",
+      "value": "",
+      "enabled": true
+    },
+    {
+      "key": "random_uuid",
+      "value": "",
+      "enabled": true
+    },
+    {
+      "key": "virtual_link_instance_name",
+      "value": "integration_test_vl_instance_01",
+      "enabled": true
+    },
+    {
+      "key": "service_name_macro",
+      "value": "integration_test_service_macro_ubuntu16",
+      "enabled": true
+    },
+    {
+      "key": "auto_vendor_id",
+      "value": "f77a3788d63444cd81368ecab410b95a",
+      "enabled": true
+    },
+    {
+      "key": "auto_vendor_version_id",
+      "value": "309bdd191bab465a8d27d0332d639d5e",
+      "enabled": true
+    },
+    {
+      "key": "auto_vsp_id",
+      "value": "dbdcd699dfe74b68b8d6b6da1eb7e0b5",
+      "enabled": true
+    },
+    {
+      "key": "auto_vsp_version_id",
+      "value": "8c72a115f91644e5b21737752b637b96",
+      "enabled": true
+    },
+    {
+      "key": "auto_vsp_version_name",
+      "value": "1.0",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_invariant_uuid",
+      "value": "9b06ebbf-8e4b-4941-bc76-2881d1684084",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_unique_id",
+      "value": "1bd19365-99c5-4e44-9d50-af212b3df0a3",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_uuid",
+      "value": "8bfc1d89-5735-448f-a47e-20979adff87d",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_new_unique_id",
+      "value": "1bd19365-99c5-4e44-9d50-af212b3df0a3",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_invariant_uuid",
+      "value": "9f84a760-d0da-4f85-9321-f85ef0e3bb7a",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_unique_id",
+      "value": "a9b9158b-72a0-48c1-ad37-881418c95736",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_uuid",
+      "value": "b45fa356-02b9-445c-893c-2ab505be5b1f",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_customization_uuid",
+      "value": "4a284697-5318-42e9-8084-32354e792cc2",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_name_for_model",
+      "value": "integration_test_VF_ubuntu16_2 0",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_invariant_uuid",
+      "value": "f8337441-a19b-41f6-94a4-2a53d9b612f0",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_uuid",
+      "value": "c3b97017-de13-4843-b1fe-7e8c44e50d76",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_unique_id",
+      "value": "bc5b779d-55b7-4fd7-9618-e29388f464b8",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_customization_uuid",
+      "value": "4d4c2084-77f9-491e-ba28-1188ef550578",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_name_for_model",
+      "value": "Generic NeutronNet 0",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_new_unique_id",
+      "value": "5b18e896-57e3-4148-a833-7545c3873175",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_module_model_customization_name",
+      "value": "IntegrationTestVfUbuntu162..base_ubuntu16..module-0",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_module_model_customization_uuid",
+      "value": "470956aa-b739-4cdd-b114-7ce032f65b18",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_module_model_invariant_uuid",
+      "value": "273bef63-1f26-4b14-91e0-003fa203ead2",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_module_model_name",
+      "value": "IntegrationTestVfUbuntu162..base_ubuntu16..module-0",
+      "enabled": true
+    },
+    {
+      "key": "auto_vf_module_model_uuid",
+      "value": "7cdf75de-ff3c-4a7d-a7e0-ecbc00693e8e",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_model_customization_uuid",
+      "value": "4d4c2084-77f9-491e-ba28-1188ef550578",
+      "enabled": true
+    },
+    {
+      "key": "auto_distribution_id",
+      "value": "bc5e4a16-e8d4-48e5-a4d9-47dc8117205d",
+      "enabled": true
+    },
+    {
+      "key": "auto_customer_id",
+      "value": "integration_test_customer",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_invariantUUID",
+      "value": "585de80a-d274-45dc-901a-0e598a91124c",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_resource_version",
+      "value": "1571751308981",
+      "enabled": true
+    },
+    {
+      "key": "auto_owning_entity_id",
+      "value": "8874891f-5120-4b98-b452-46284513958d",
+      "enabled": true
+    },
+    {
+      "key": "auto_service_instance_id",
+      "value": "7d550d9e-e1c4-4a21-a2bb-1c3ced8a8722",
+      "enabled": true
+    },
+    {
+      "key": "auto_so_request_id",
+      "value": "8e6d4175-ec6b-4bc4-80e6-f99c41bd3334",
+      "enabled": true
+    },
+    {
+      "key": "auto_virtual_link_instance_id",
+      "value": "undefined",
+      "enabled": true
+    },
+    {
+      "key": "auto_vnf_instance_id",
+      "value": "9764c2af-e4b0-413d-80cd-b65014ea0926",
+      "enabled": true
+    },
+    {
+      "key": "auto_vfmodule_instance_id",
+      "value": "87c9a613-e8bb-4546-a37a-d7d1d3dc62bd",
+      "enabled": true
+    },
+    {
+      "key": "owning_entity_id",
+      "value": "8874891f-5120-4b98-b452-46284513958d",
+      "enabled": true
+    }
+  ],
+  "_postman_variable_scope": "environment",
+  "_postman_exported_at": "2019-12-12T16:38:37.983Z",
+  "_postman_exported_using": "Postman/7.13.0"
+}