Updated robot scripts to support R1.1.0 changes

Issue: TEST-47
Change-Id: I5f6bfa936ca873237e61242f3d568f5ab09eceaa
Signed-off-by: Jerry Flood <jf9860@att.com>

diff --git a/robot/assets/templates/asdc/feature_group.template b/robot/assets/templates/asdc/feature_group.template
index 3d87b04..8404baf 100644 (file)
--- a/robot/assets/templates/asdc/feature_group.template
+++ b/robot/assets/templates/asdc/feature_group.template
@@ -7,5 +7,6 @@
   ],
   "addedEntitlementPoolsIds": [
     "${entitlement_pool_id}"
-  ]
+  ],
+  "manufacturerReferenceNumber" : "${manufacturer_reference_number}"
 }
\ No newline at end of file

diff --git a/robot/assets/templates/asdc/software_product.template b/robot/assets/templates/asdc/software_product.template
index a5938f2..9c65be9 100644 (file)
--- a/robot/assets/templates/asdc/software_product.template
+++ b/robot/assets/templates/asdc/software_product.template
@@ -3,6 +3,7 @@
   "description": "vendor software product",
   "category": "resourceNewCategory.generic",
   "subCategory": "resourceNewCategory.generic.abstract",
+  "onboardingMethod" : "HEAT",
   "licensingVersion":  {
         "id" : "1.0",
         "label" : "1.0"

diff --git a/robot/resources/aai/service_instance.robot b/robot/resources/aai/service_instance.robot
index 5bae2f7..f2cf7d8 100644 (file)
--- a/robot/resources/aai/service_instance.robot
+++ b/robot/resources/aai/service_instance.robot
@@ -40,8 +40,8 @@ Validate Service Instance
     ${cust_resp}=    Run A&AI Get Request      ${INDEX PATH}/business/customers?subscriber-name=${customer_name}
        ${resp}=    Run A&AI Get Request      ${INDEX PATH}${CUSTOMER SPEC PATH}${cust_resp.json()['customer'][0]['global-customer-id']}${SERVICE SUBSCRIPTIONS}${service_type}${SERVICE INSTANCE}${service_instance_name}
     Dictionary Should Contain Value    ${resp.json()['service-instance'][0]}    ${service_instance_name}
-    Dictionary Should Contain Key      ${resp.json()['service-instance'][0]}    persona-model-id
-    Dictionary Should Contain Key      ${resp.json()['service-instance'][0]}    persona-model-version
+    #Dictionary Should Contain Key     ${resp.json()['service-instance'][0]}    persona-model-id
+    #Dictionary Should Contain Key     ${resp.json()['service-instance'][0]}    persona-model-version
 
 Validate Generic VNF
     [Documentation]    Query and Validates A&AI Service Instance

diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 463fb6b..5ba0e48 100644 (file)
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -195,7 +195,7 @@ Add ASDC Feature Group
     [Arguments]    ${license_model_id}    ${key_group_id}    ${entitlement_pool_id}      ${version_id}=0.1
     ${uuid}=    Generate UUID
     ${shortened_uuid}=     Evaluate    str("${uuid}")[:23]
-    ${map}=    Create Dictionary    feature_group_name=${shortened_uuid}    key_group_id=${key_group_id}    entitlement_pool_id=${entitlement_pool_id}
+    ${map}=    Create Dictionary    feature_group_name=${shortened_uuid}    key_group_id=${key_group_id}    entitlement_pool_id=${entitlement_pool_id}   manufacturer_reference_number=mrn${shortened_uuid}
     ${data}=   Fill JSON Template File    ${ASDC_FEATURE_GROUP_TEMPLATE}    ${map}
     ${resp}=    Run ASDC Post Request    ${ASDC_VENDOR_LICENSE_MODEL_PATH}/${license_model_id}/versions/${version_id}${ASDC_VENDOR_FEATURE_GROUP_PATH}     ${data}
     Should Be Equal As Strings         ${resp.status_code}     200

diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot
index b6e72a2..6c7f8a0 100644 (file)
--- a/robot/resources/vid/create_service_instance.robot
+++ b/robot/resources/vid/create_service_instance.robot
@@ -24,7 +24,7 @@ Create VID Service Instance
     Xpath Should Match X Times    //input[@parameter-name='Instance Name']    1
     Input Text When Enabled    //input[@parameter-name='Instance Name']    ${service_name}
     Select From List When Enabled    //select[@prompt='Select Subscriber Name']    ${customer_name}
-    Select From List WHen Enabled    //select[@prompt='Select Service Type']     ${service_type}
+    Select From List WHen Enabled    //select[@prompt='Select Service Type']     ${service_type}   timeout=${GLOBAL_VID_UI_TIMEOUT_LONG}
     Click On Button When Enabled    //div[@class = 'buttonRow']/button[text() = 'Confirm']
        Wait Until Element Contains    xpath=//div[@ng-controller= 'msoCommitController']/pre[@class = 'log ng-binding']    requestId    timeout=${GLOBAL_VID_UI_TIMEOUT_LONG}
     ${response text}=    Get Text    xpath=//div[@ng-controller= 'msoCommitController']/pre[@class = 'log ng-binding']

diff --git a/robot/resources/vid/vid_interface.robot b/robot/resources/vid/vid_interface.robot
index 896c369..d8bd553 100644 (file)
--- a/robot/resources/vid/vid_interface.robot
+++ b/robot/resources/vid/vid_interface.robot
@@ -40,7 +40,7 @@ Login To VID GUI
     # Setup Browser Now being managed by test case
     ##Setup Browser
     Go To    ${VID_LOGIN_URL}
-    Maximize Browser Window
+    #Maximize Browser Window
     Set Selenium Speed    ${GLOBAL_SELENIUM_DELAY}
     Set Browser Implicit Wait    ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}
     Log    Logging in to ${VID_ENDPOINT}${VID_ENV}