Add instantiate vLB_CDS to robot (jinja template)

Issue-ID: TEST-194
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I32590fdd944cb1f624b5d551acae3dbaed2fe350

diff --git a/robot/assets/templates/so/cds_service_template.jinja b/robot/assets/templates/so/cds_service_template.jinja
new file mode 100644 (file)
index 0000000..de2a36f
--- /dev/null
+++ b/robot/assets/templates/so/cds_service_template.jinja
@@ -0,0 +1,163 @@
+{  
+   "requestDetails":{  
+      "subscriberInfo":{  
+         "globalSubscriberId":"{{customer}}"
+      },
+      "requestInfo":{  
+         "suppressRollback":false,
+         "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+         "requestorId":"adt",
+         "instanceName":"{{cds_instance_name}}",
+         "source":"VID"
+      },
+      "cloudConfiguration":{  
+         "lcpCloudRegionId":"{{GLOBAL_INJECTED_REGION}}",
+         "tenantId":"{{GLOBAL_INJECTED_OPENSTACK_TENANT_ID}}",
+         "cloudOwner":"{{cloudOwner}}"
+      },
+      "requestParameters":{  
+         "subscriptionServiceType":"{{subscriptionServiceType}}",
+         "userParams":[  
+            {  
+               "Homing_Solution":"none"
+            },
+            {  
+               "service":{  
+                  "instanceParams":[  
+
+                  ],
+                  "instanceName":"{{cds_instance_name}}",
+                  "resources":{  
+                     "vnfs":[  
+                        {  
+                           "modelInfo":{  
+                              "modelName":"{{resp['serviceVnfs'][0]['modelInfo']['modelName']}}",
+                              "modelVersionId":"{{resp['serviceVnfs'][0]['modelInfo']['modelUuid']}}",
+                              "modelInvariantUuid":"{{resp['serviceVnfs'][0]['modelInfo']['modelInvariantUuid']}}",
+                              "modelVersion":"1.0",
+                              "modelCustomizationId":"{{resp['serviceVnfs'][0]['modelInfo']['modelCustomizationUuid']}}",
+                              "modelInstanceName":"{{resp['serviceVnfs'][0]['modelInfo']['modelInstanceName']}}"
+                           },
+                           "cloudConfiguration":{  
+                              "lcpCloudRegionId":"{{GLOBAL_INJECTED_REGION}}",
+                              "tenantId":"{{GLOBAL_INJECTED_OPENSTACK_TENANT_ID}}"
+                           },
+                           "platform":{  
+                              "platformName":"test"
+                           },
+                           "lineOfBusiness":{  
+                              "lineOfBusinessName":"LOB-Demonstration"
+                           },
+                           "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+                           "instanceName":"{{resp['serviceVnfs'][0]['modelInfo']['modelInstanceName']}}",
+                           "instanceParams":[  
+                              {  
+                                 "onap_private_net_id":"{{GLOBAL_INJECTED_NETWORK}}",
+                                 "onap_private_subnet_id":"{{GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID}}",
+                                 "pub_key":"{{GLOBAL_INJECTED_PUBLIC_KEY}}",
+                                 "image_name":"{{GLOBAL_INJECTED_UBUNTU_1604_IMAGE}}",
+                                 "flavor_name":"{{GLOBAL_INJECTED_VM_FLAVOR}}",
+                                 "vpg_flavor_name":"{{GLOBAL_INJECTED_VM_FLAVOR}}",
+                                 "vlb_flavor_name":"{{GLOBAL_INJECTED_VM_FLAVOR}}",
+                                 "vdns_flavor_name":"{{GLOBAL_INJECTED_VM_FLAVOR}}",
+                                 "sec_group":"{{GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP}}",
+                                 "install_script_version":"{{GLOBAL_INJECTED_SCRIPT_VERSION}}",
+                                 "demo_artifacts_version":"{{GLOBAL_INJECTED_SCRIPT_VERSION}}",
+                                 "cloud_env":"{{GLOBAL_INJECTED_CLOUD_ENV}}",
+                                 "public_net_id":"{{GLOBAL_INJECTED_PUBLIC_NET_ID}}",
+                                 "aic-cloud-region":"{{GLOBAL_INJECTED_REGION}}"
+                              }
+                           ],
+                           "vfModules":[  
+                              {  
+                                 "modelInfo":{  
+                                    "modelName":"{{resp['serviceVnfs'][0]['vfModules'][0]['modelInfo']['modelName']}}",
+                                    "modelVersionId":"{{resp['serviceVnfs'][0]['vfModules'][0]['modelInfo']['modelUuid']}}",
+                                    "modelInvariantUuid":"{{resp['serviceVnfs'][0]['vfModules'][0]['modelInfo']['modelInvariantUuid']}}",
+                                    "modelVersion":"1",
+                                    "modelCustomizationId":"{{resp['serviceVnfs'][0]['vfModules'][0]['modelInfo']['modelCustomizationUuid']}}"
+                                 },
+                                 "instanceName":"{{resp['serviceVnfs'][0]['vfModules'][0]['modelInfo']['modelName']}}",
+                                 "instanceParams":[  
+                                    {  
+
+                                    }
+                                 ]
+                              },
+                              {  
+                                 "modelInfo":{  
+                                    "modelName":"{{resp['serviceVnfs'][0]['vfModules'][1]['modelInfo']['modelName']}}",
+                                    "modelVersionId":"{{resp['serviceVnfs'][0]['vfModules'][1]['modelInfo']['modelUuid']}}",
+                                    "modelInvariantUuid":"{{resp['serviceVnfs'][0]['vfModules'][1]['modelInfo']['modelInvariantUuid']}}",
+                                    "modelVersion":"1",
+                                    "modelCustomizationId":"{{resp['serviceVnfs'][0]['vfModules'][1]['modelInfo']['modelCustomizationUuid']}}"
+                                 },
+                                 "instanceName":"{{resp['serviceVnfs'][0]['vfModules'][1]['modelInfo']['modelName']}}",
+                                 "instanceParams":[  
+                                    {  
+
+                                    }
+                                 ]
+                              },
+                              {  
+                                 "modelInfo":{  
+                                    "modelName":"{{resp['serviceVnfs'][0]['vfModules'][2]['modelInfo']['modelName']}}",
+                                    "modelVersionId":"{{resp['serviceVnfs'][0]['vfModules'][2]['modelInfo']['modelUuid']}}",
+                                    "modelInvariantUuid":"{{resp['serviceVnfs'][0]['vfModules'][2]['modelInfo']['modelInvariantUuid']}}",
+                                    "modelVersion":"1",
+                                    "modelCustomizationId":"{{resp['serviceVnfs'][0]['vfModules'][2]['modelInfo']['modelCustomizationUuid']}}"
+                                 },
+                                 "instanceName":"{{resp['serviceVnfs'][0]['vfModules'][2]['modelInfo']['modelName']}}",
+                                 "instanceParams":[  
+                                    {  
+
+                                    }
+                                 ]
+                              },
+                              {  
+                                 "modelInfo":{  
+                                    "modelName":"{{resp['serviceVnfs'][0]['vfModules'][3]['modelInfo']['modelName']}}",
+                                    "modelVersionId":"{{resp['serviceVnfs'][0]['vfModules'][3]['modelInfo']['modelUuid']}}",
+                                    "modelInvariantUuid":"{{resp['serviceVnfs'][0]['vfModules'][3]['modelInfo']['modelInvariantUuid']}}",
+                                    "modelVersion":"1",
+                                    "modelCustomizationId":"{{resp['serviceVnfs'][0]['vfModules'][3]['modelInfo']['modelCustomizationUuid']}}"
+                                 },
+                                 "instanceName":"{{resp['serviceVnfs'][0]['vfModules'][3]['modelInfo']['modelName']}}",
+                                 "instanceParams":[  
+                                    {  
+
+                                    }
+                                 ]
+                              }
+                           ]
+                        }
+                     ]
+                  },
+                  "modelInfo":{  
+                     "modelVersion":"1.0",
+                     "modelVersionId":"{{service_uuid}}",
+                     "modelInvariantId":"{{service_invariantUUID}}",
+                     "modelName":"{{cds_service_model}}",
+                     "modelType":"service"
+                  }
+               }
+            }
+         ],
+         "aLaCarte":false
+      },
+      "project":{  
+         "projectName":"Project-Demonstration"
+      },
+      "owningEntity":{  
+         "owningEntityId":"67f2e84c-734d-4e90-a1e4-d2ffa2e75849",
+         "owningEntityName":"OE-Demonstration"
+      },
+      "modelInfo":{  
+         "modelVersion":"1.0",
+         "modelVersionId":"{{service_uuid}}",
+         "modelInvariantId":"{{service_invariantUUID}}",
+         "modelName":"{{cds_service_model}}",
+         "modelType":"service"
+      }
+   }
+}

diff --git a/robot/resources/cds_interface.robot b/robot/resources/cds_interface.robot
index 3c7ee01..089e49f 100644 (file)
--- a/robot/resources/cds_interface.robot
+++ b/robot/resources/cds_interface.robot
@@ -20,7 +20,7 @@ ${SDC_SERVICE_CATALOG_ENDPOINT}  ${GLOBAL_SDC_SERVER_PROTOCOL}://${GLOBAL_INJECT
 ${SDC_SERVICE_CATALOG_PATH}    sdc2/rest/v1/catalog/services/serviceName/demoVLB_CDS/serviceVersion/1.0
 ${SO_CATALOGDB_PATH}  /ecomp/mso/catalog/v2/serviceVnfs?serviceModelName
 ${SO_APIHANDLER_PATH}    /onap/so/infra/serviceInstantiation/v7/serviceInstances
-${SO_REQUESTDB_PATH}  /infraActiveRequests
+${SO_REQUESTDB_PATH}  /onap/so/infra/orchestrationRequests/v7
 
 ${customer}    Demonstration
 ${cloudOwner}    CloudOwner
@@ -71,4 +71,4 @@ Service Assign & Activate
 Check Infra Active Requests
     [Arguments]  ${cds_requestid}
     ${auth}=  Create List  ${GLOBAL_SO_CATDB_USERNAME }  ${GLOBAL_SO_PASSWORD}        
-    SO.Run Polling Get Request  ${GLOBAL_SO_REQDB_ENDPOINT}  ${SO_REQUESTDB_PATH}/${cds_requestid}  tries=30   interval=60  auth=${auth}
+    SO.Run Polling Get Request  ${GLOBAL_SO_APIHAND_ENDPOINT}  ${SO_REQUESTDB_PATH}/${cds_requestid}  tries=30   interval=60  auth=${auth}