Refactor api definition yamls to support jinja2

Issue-ID: VNFSDK-181
Change-Id: Ibff00e985f95b400f08d4de4021dc3a8ab235ad7
Signed-off-by: Moshe <moshehoa@amdocs.com>

Support creation of multiple vf-modules per vnf

Issue-ID: VNFSDK-264
Change-Id: I45054bc4bb721d7df89653e99fafe61297939504
Signed-off-by: Moshe <moshehoa@amdocs.com>

fix tests

Issue-ID: VNFSDK-264
Change-Id: I077289bfcd4c68b0191fd74c4e02e07a67f5104f
Signed-off-by: Moshe <moshehoa@amdocs.com>

8 files changed, 235 insertions, 273 deletions

diff --git a/vnftest/onap/lifecycle/create_customer.yaml b/vnftest/onap/lifecycle/create_customer.yaml
index 97327ba..e950eb4 100644
--- a/vnftest/onap/lifecycle/create_customer.yaml
+++ b/vnftest/onap/lifecycle/create_customer.yaml
@@ -13,39 +13,34 @@
 ##############################################################################
 
 ---
-method: "PUT"
-url: "http://{aai_ip}:30232/aai/v8/business/customers/customer/{customer_name}"
-headers: {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": "Basic QUFJOkFBSQ==",
-        "X-FromAppId": "AAI",
-        "X-TransactionId": "get_aai_subscr"
-        }
-body: {
-              "global-customer-id": "{customer_name}",
-              "service-subscriptions": {
-                      "service-subscription": [{
-                              "relationship-list": {
-                                      "relationship": [{
-                                              "related-to": "tenant",
-                                              "relationship-data": [{
-                                                      "relationship-key": "cloud-region.cloud-owner",
-                                                      "relationship-value": "{cloud_owner}"
-                                              },
-                                              {
-                                                      "relationship-key": "cloud-region.cloud-region-id",
-                                                      "relationship-value": "RegionOne"
-                                              },
-                                              {
-                                                      "relationship-key": "tenant.tenant-id",
-                                                      "relationship-value": "{tenant_id}"
-                                              }]
-                                      }]
-                              },
-                              "service-type": "vFW"
-                      }]
-              },
-              "subscriber-name": "{customer_name}",
-              "subscriber-type": "INFRA"
-      }
+method: PUT
+url: http://{{aai_ip}}:30232/aai/v8/business/customers/customer/{{customer_name}}
+headers:
+  Content-Type: application/json
+  Accept: application/json
+  Authorization: Basic QUFJOkFBSQ==
+  X-FromAppId: AAI
+  X-TransactionId: get_aai_subscr
+
+body:
+  global-customer-id: {{customer_name}}
+  service-subscriptions:
+    service-subscription:
+    -
+      service-type: vFW
+      relationship-list:
+        relationship:
+        -
+          related-to: tenant
+          relationship-data:
+          -
+            relationship-key: cloud-region.cloud-owner
+            relationship-value: {{cloud_owner}}
+          -
+            relationship-key: cloud-region.cloud-region-id
+            relationship-value: RegionOne
+          -
+            relationship-key: tenant.tenant-id
+            relationship-value: {{tenant_id}}
+  subscriber-name: {{customer_name}}
+  subscriber-type: INFRA
diff --git a/vnftest/onap/lifecycle/create_region.yaml b/vnftest/onap/lifecycle/create_region.yaml
index 1a67f41..41da02a 100644
--- a/vnftest/onap/lifecycle/create_region.yaml
+++ b/vnftest/onap/lifecycle/create_region.yaml
@@ -13,28 +13,23 @@
 ##############################################################################
 
 ---
-method: "PUT"
-url: "http://{aai_ip}:30232/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{cloud_owner}/RegionOne"
-headers: {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": "Basic QUFJOkFBSQ==",
-        "X-FromAppId": "AAI",
-        "X-TransactionId": "get_aai_subscr"
-        }
-body: {
-          "cloud-owner": "{cloud_owner}",
-          "cloud-region-id": "RegionOne",
-          "cloud-region-version": "v1",
-          "cloud-type": "SharedNode",
-          "cloud-zone": "CloudZone",
-          "owner-defined-type": "OwnerType",
-          "tenants": {
-              "tenant": [
-                  {
-                      "tenant-id": "{tenant_id}",
-                      "tenant-name": "{tenant_name}"
-                  }
-              ]
-          }
-      }
+method: PUT
+url: http://{{aai_ip}}:30232/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/{{cloud_owner}}/RegionOne
+headers:
+  Content-Type: application/json
+  Accept: application/json
+  Authorization: Basic QUFJOkFBSQ==
+  X-FromAppId: AAI
+  X-TransactionId: get_aai_subscr
+body:
+  cloud-owner: {{cloud_owner}}
+  cloud-region-id: RegionOne
+  cloud-region-version: v1
+  cloud-type: SharedNode
+  cloud-zone: CloudZone
+  owner-defined-type: OwnerType
+  tenants:
+    tenant:
+    -
+      tenant-id: {{tenant_id}}
+      tenant-name: {{tenant_name}}
\ No newline at end of file
diff --git a/vnftest/onap/lifecycle/create_service.yaml b/vnftest/onap/lifecycle/create_service.yaml
index 7b8c107..0e1abda 100644
--- a/vnftest/onap/lifecycle/create_service.yaml
+++ b/vnftest/onap/lifecycle/create_service.yaml
@@ -11,15 +11,16 @@
 # See the License for the specific language governing permissions and limitations under
 # the License
 ##############################################################################
-
 ---
-method: "PUT"
-url: "http://{aai_ip}:30232/aai/v8/service-design-and-creation/services/service/vFW"
-headers: {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": "Basic QUFJOkFBSQ==",
-        "X-FromAppId": "AAI",
-        "X-TransactionId": "get_aai_subscr"
-        }
-body: {"service-description":"vFW","service-id":"vFW"}
+method: PUT
+url: http://{{aai_ip}}:30232/aai/v8/service-design-and-creation/services/service/vFW
+headers:
+  Content-Type: application/json
+  Accept: application/json
+  Authorization: Basic QUFJOkFBSQ==
+  X-FromAppId: AAI
+  X-TransactionId: get_aai_subscr
+
+body:
+  service-description: vFW
+  service-id: vFW
diff --git a/vnftest/onap/lifecycle/create_service_instance.yaml b/vnftest/onap/lifecycle/create_service_instance.yaml
index 93850b7..996c580 100644
--- a/vnftest/onap/lifecycle/create_service_instance.yaml
+++ b/vnftest/onap/lifecycle/create_service_instance.yaml
@@ -11,42 +11,35 @@
 # See the License for the specific language governing permissions and limitations under
 # the License
 ##############################################################################
-
 ---
-method: "POST"
-url: "http://{mso_ip}/ecomp/mso/infra/serviceInstances/v5"
-headers: {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-        "X-FromAppId": "MSO",
-        "X-TransactionId": "demo"
-        }
-body: {
-          "requestDetails": {
-              "requestInfo": {
-                  "source": "VID",
-                  "requestorId": "vid1",
-                  "suppressRollback": "true",
-                  "instanceName": "{service_instance_name}"
-              },
-              "modelInfo": {
-                  "modelVersionId": "{service_model_version_id}",
-                  "modelVersion": "{service_model_version}",
-                  "modelName": "{service_model_normalized_name}",
-                  "modelInvariantId": "{service_model_invariant_id}",
-                  "modelType": "service"
-              },
-              "requestParameters": {
-                  "userParams": [
+method: POST
+url: http://{{mso_ip}}/ecomp/mso/infra/serviceInstances/v5
+headers:
+  Content-Type: application/json
+  Accept: application/json
+  Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==
+  X-FromAppId: MSO
+  X-TransactionId: demo
+
+body:
+  requestDetails:
+    requestInfo:
+      source: VID
+      requestorId: vid1
+      suppressRollback: true
+      instanceName: {{service_instance_name}}
+
+    modelInfo:
+      modelVersionId: {{service_model_version_id}}
+      modelVersion: {{service_model_version}}
+      modelName: {{service_model_normalized_name}}
+      modelInvariantId: {{service_model_invariant_id}}
+      modelType: service
 
-                  ],
-                  "aLaCarte": "true",
-                  "subscriptionServiceType": "vFW"
-              },
-              "subscriberInfo": {
-                  "globalSubscriberId": "{customer_name}"
-              }
-          }
-      }
+    requestParameters:
+      userParams: []
+      aLaCarte: true
+      subscriptionServiceType: vFW
 
+    subscriberInfo:
+      globalSubscriberId: {{customer_name}}
\ No newline at end of file
diff --git a/vnftest/onap/lifecycle/create_vf_module.yaml b/vnftest/onap/lifecycle/create_vf_module.yaml
index ed46c7d..1728a07 100644
--- a/vnftest/onap/lifecycle/create_vf_module.yaml
+++ b/vnftest/onap/lifecycle/create_vf_module.yaml
@@ -11,68 +11,58 @@
 # See the License for the specific language governing permissions and limitations under
 # the License
 ##############################################################################
-
 ---
-method: "POST"
-url: "http://{mso_ip}/ecomp/mso/infra/serviceInstances/v5/{service_instance_id}/vnfs/{vnf_instance_id}/vfModules"
-headers: {
-        "Content-Type": "application/json",
-        "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-        "X-FromAppId": "MSO",
-        "X-TransactionId": "demo",
-        "Accept": "application/json"
-        }
-body: {
-        "requestDetails": {
-          "requestInfo": {
-            "instanceName": "{vnf_name}",
-            "source": "VID",
-            "suppressRollback": "true",
-            "requestorId": "vid1"
-          },
-          "modelInfo": {
-            "modelType": "vfModule",
-            "modelInvariantId": "{module_model_invariant_id}",
-            "modelVersionId": "{module_model_version_id}",
-            "modelName": "{vnf_type}",
-            "modelVersion": "{module_model_version}",
-            "modelCustomizationId": "{service_model_customization_id}",
-            "modelCustomizationName": "{vnf_type}"
-          },
-          "requestParameters": {
-            "usePreload": "true"
-          },
-          "cloudConfiguration": {
-            "lcpCloudRegionId": "RegionOne",
-            "tenantId": "{tenant_id}"
-          },
-          "relatedInstanceList": [
-            {
-              "relatedInstance": {
-                "instanceId": "{service_instance_id}",
-                "modelInfo": {
-                  "modelType": "service",
-                  "modelName": "{service_model_name}",
-                  "modelInvariantId": "{service_model_invariant_id}",
-                  "modelVersion": "{service_model_version}",
-                  "modelVersionId": "{distributed_service_id}"
-                }
-              }
-            },
-            {
-              "relatedInstance": {
-                "instanceId": "{vnf_instance_id}",
-                "modelInfo": {
-                  "modelType": "vnf",
-                  "modelName": "{resource_model_name}",
-                  "modelInvariantId": "{resource_model_invariant_id}",
-                  "modelVersion": "{resource_model_version}",
-                  "modelVersionId": "{resource_model_version_id}",
-                  "modelCustomizationId": "{resource_model_customization_id}",
-                  "modelCustomizationName": "{resource_model_customization_name}"
-                }
-              }
-            }
-          ]
-        }
-      }
+method: POST
+url: http://{{mso_ip}}/ecomp/mso/infra/serviceInstances/v5/{{service_instance_id}}/vnfs/{{vnf_instance_id}}/vfModules
+headers:
+  Content-Type: application/json
+  Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==
+  X-FromAppId: MSO
+  X-TransactionId: demo
+  Accept: application/json
+
+body:
+  requestDetails:
+    requestInfo:
+      instanceName: {{vnf_name}}
+      source: VID
+      suppressRollback: true
+      requestorId: vid1
+
+    modelInfo:
+      modelType: vfModule
+      modelInvariantId: {{module_model_invariant_id}}
+      modelVersionId: {{module_model_version_id}}
+      modelName: {{vnf_type}}
+      modelVersion: {{module_model_version}}
+      modelCustomizationId: {{module_model_customization_id}}
+      modelCustomizationName: {{vnf_type}}
+
+    requestParameters:
+      usePreload: true
+
+    cloudConfiguration:
+      lcpCloudRegionId: RegionOne
+      tenantId: {{tenant_id}}
+
+    relatedInstanceList:
+    -
+      relatedInstance:
+        instanceId: {{service_instance_id}}
+        modelInfo:
+          modelType: service
+          modelName: {{service_model_name}}
+          modelInvariantId: {{service_model_invariant_id}}
+          modelVersion: {{service_model_version}}
+          modelVersionId: {{distributed_service_id}}
+    -
+      relatedInstance:
+        instanceId: {{vnf_instance_id}}
+        modelInfo:
+          modelType: vnf
+          modelName: {{resource_model_name}}
+          modelInvariantId: {{resource_model_invariant_id}}
+          modelVersion: {{resource_model_version}}
+          modelVersionId: {{resource_model_version_id}}
+          modelCustomizationId: {{resource_model_customization_id}}
+          modelCustomizationName: {{resource_model_customization_name}}
\ No newline at end of file
diff --git a/vnftest/onap/lifecycle/create_vnf_instance.yaml b/vnftest/onap/lifecycle/create_vnf_instance.yaml
index 653b97d..441a776 100644
--- a/vnftest/onap/lifecycle/create_vnf_instance.yaml
+++ b/vnftest/onap/lifecycle/create_vnf_instance.yaml
@@ -11,57 +11,48 @@
 # See the License for the specific language governing permissions and limitations under
 # the License
 ##############################################################################
-
 ---
-method: "POST"
-url: "http://{mso_ip}/ecomp/mso/infra/serviceInstances/v5/{service_instance_id}/vnfs/"
-headers: {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-        "X-FromAppId": "MSO",
-        "X-TransactionId": "demo"
-        }
-body: {
-        "requestDetails": {
-          "requestInfo": {
-            "instanceName":"{vnf_instance_name}",
-            "source": "VID",
-            "suppressRollback": "true",
-            "requestorId": "vid1",
-            "productFamilyId": "vFW"
-          },
-          "modelInfo": {
-            "modelType": "vnf",
-            "modelInvariantId": "{resource_model_invariant_id}",
-            "modelVersionId": "{resource_model_version_id}",
-            "modelName": "{resource_model_name}",
-            "modelVersion": "{resource_model_version}",
-            "modelCustomizationId": "{resource_model_customization_id}",
-            "modelCustomizationName": "{resource_model_customization_name}"
-          },
-          "requestParameters": {
-            "userParams": []
-          },
-          "cloudConfiguration": {
-            "lcpCloudRegionId": "RegionOne",
-            "tenantId": "{tenant_id}"
-          },
-          "relatedInstanceList": [
-            {
-              "relatedInstance": {
-                "instanceId": "{service_instance_id}",
-                "modelInfo": {
-                  "modelType": "service",
-                  "modelName": "{service_model_name}",
-                  "modelInvariantId": "{service_model_invariant_id}",
-                  "modelVersion": "{service_model_version}",
-                  "modelVersionId": "{distributed_service_id}"
-                }
-              }
-            }
-          ]
-        }
-      }
+method: POST
+url: http://{{mso_ip}}/ecomp/mso/infra/serviceInstances/v5/{{service_instance_id}}/vnfs/
+headers:
+  Content-Type: application/json
+  Accept: application/json
+  Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==
+  X-FromAppId: MSO
+  X-TransactionId: demo
+
+body:
+  requestDetails:
+    requestInfo:
+      instanceName: {{vnf_instance_name}}
+      source: VID
+      suppressRollback: true
+      requestorId: vid1
+      productFamilyId: vFW
+
+    modelInfo:
+      modelType: vnf
+      modelInvariantId: {{resource_model_invariant_id}}
+      modelVersionId: {{resource_model_version_id}}
+      modelName: {{resource_model_name}}
+      modelVersion: {{resource_model_version}}
+      modelCustomizationId: {{resource_model_customization_id}}
+      modelCustomizationName: {{resource_model_customization_name}}
+
+    requestParameters:
+      userParams: []
 
+    cloudConfiguration:
+      lcpCloudRegionId: RegionOne
+      tenantId: {{tenant_id}}
 
+    relatedInstanceList:
+    -
+      relatedInstance:
+        instanceId: {{service_instance_id}}
+        modelInfo:
+          modelType: service
+          modelName: {{service_model_name}}
+          modelInvariantId: {{service_model_invariant_id}}
+          modelVersion: {{service_model_version}}
+          modelVersionId: {{distributed_service_id}}
diff --git a/vnftest/onap/lifecycle/monitor_request.yaml b/vnftest/onap/lifecycle/monitor_request.yaml
index 4304f0e..9593967 100644
--- a/vnftest/onap/lifecycle/monitor_request.yaml
+++ b/vnftest/onap/lifecycle/monitor_request.yaml
@@ -11,14 +11,13 @@
 # See the License for the specific language governing permissions and limitations under
 # the License
 ##############################################################################
-
 ---
-method: "GET"
-url: "http://{mso_ip}/ecomp/mso/infra/orchestrationRequests/v2/{request_id}"
-headers: {
-        "Content-Type": "application/json",
-        "Accept": "application/json",
-        "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
-        "X-FromAppId": "AAI",
-        "X-TransactionId": "get_aai_subscr"
-        }
+method: GET
+url: http://{{mso_ip}}/ecomp/mso/infra/orchestrationRequests/v2/{{request_id}}
+headers:
+  Content-Type: application/json
+  Accept: application/json
+  Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==
+  X-FromAppId: AAI
+  X-TransactionId: get_aai_subscr
+
diff --git a/vnftest/onap/lifecycle/preload_sdnc.yaml b/vnftest/onap/lifecycle/preload_sdnc.yaml
index 4053dd0..627831c 100644
--- a/vnftest/onap/lifecycle/preload_sdnc.yaml
+++ b/vnftest/onap/lifecycle/preload_sdnc.yaml
@@ -11,44 +11,42 @@
 # See the License for the specific language governing permissions and limitations under
 # the License
 ##############################################################################
-
 ---
-method: "POST"
-url: "http://{aai_ip}:30202/restconf/operations/VNF-API:preload-vnf-topology-operation"
-headers: {
-        "Content-Type": "application/json",
-        "Authorization": "Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==",
-        "X-FromAppId": "AAI",
-        "X-TransactionId": "0a3f6713-ba96-4971-a6f8-c2da85a3176e",
-        "Accept": "application/json"
-        }
-body: {
-          "input": {
-              "request-information": {
-                  "notification-url": "openecomp.org",
-                  "order-number": "1",
-                  "order-version": "1",
-                  "request-action": "PreloadVNFRequest",
-                  "request-id": "test"
-              },
-              "sdnc-request-header": {
-                  "svc-action": "reserve",
-                  "svc-notification-url": "http:openecomp.org:8080",
-                  "svc-request-id": "test"
-              },
-              "vnf-topology-information": {
-                "vnf-assignments": {
-                      "availability-zones": [],
-                      "vnf-networks": [],
-                      "vnf-vms": []
-                  },
-                  "vnf-topology-identifier": {
-                      "generic-vnf-name": "{vnf_instance_name}",
-                      "generic-vnf-type": "{service_model_name}/{resource_instance_model_name} 0",
-                      "service-type": "{service_instance_id}",
-                      "vnf-name": "{vnf_name}",
-                      "vnf-type": "{vnf_type}"
-                  }
-              }
-          }
-      }
+method: POST
+url: http://{{aai_ip}}:30202/restconf/operations/VNF-API:preload-vnf-topology-operation
+headers:
+  Content-Type: application/json
+  Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==
+  X-FromAppId: AAI
+  X-TransactionId: 0a3f6713-ba96-4971-a6f8-c2da85a3176e
+  Accept: application/json
+
+body:
+  input:
+    request-information:
+      notification-url: openecomp.org
+      order-number: 1
+      order-version: 1
+      request-action: PreloadVNFRequest
+      request-id: test
+    sdnc-request-header:
+      svc-action: reserve
+      svc-notification-url: "http://openecomp.org:8080"
+      svc-request-id: test
+    vnf-topology-information:
+      vnf-assignments:
+        availability-zones: []
+        vnf-networks: []
+        vnf-vms: []
+      vnf-parameters:
+      {% for vnf_parameter in vnf_parameters %}
+      -
+        vnf-parameter-name: {{vnf_parameter.name}}
+        vnf-parameter-value: {{vnf_parameter.value}}
+      {% endfor %}
+      vnf-topology-identifier:
+        generic-vnf-name: {{vnf_instance_name}}
+        generic-vnf-type: {{service_model_name}}/{{resource_instance_model_name}} 0
+        service-type: {{service_instance_id}}
+        vnf-name: {{vnf_name}}
+        vnf-type: {{vnf_type}}