Fail on DISTRIBUTION_COMPLETE_ERROR

Create Keyword for Download CSAR

Issue-ID: INT-1314
Change-Id: I576093cea61fd5f77aafb6edd119c254b674a2fc
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot
index eadcd9c..4cedcd2 100644 (file)
--- a/robot/resources/sdc_interface.robot
+++ b/robot/resources/sdc_interface.robot
@@ -936,7 +936,7 @@ Check Catalog Service Distributed
     \    Log    ${ELEMENT['status']}
     \    ${SO_COMPLETE}   Set Variable If   (('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_OK')) or ('${SO_COMPLETE}'=='TRUE')  TRUE
     \    Exit For Loop If   ('${SO_COMPLETE}'=='TRUE')
-    \    Exit For Loop If   ('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_ERROR')
+    \    Run Keyword If   ('${ELEMENT['status']}' == 'DISTRIBUTION_COMPLETE_ERROR')     Fatal Error    "SO DISTRIBUTION_COMPLETE_ERROR"
     \    ${dist_status}=  Set Variable If   (('${ELEMENT['status']}' == 'COMPONENT_DONE_ERROR') and ('${ELEMENT['omfComponentID']}' == 'aai-ml'))  EXIT
     \    Exit For Loop If   (('${ELEMENT['status']}' == 'COMPONENT_DONE_ERROR') and ('${ELEMENT['omfComponentID']}' == 'aai-ml'))
     Should Be True   ( '${SO_COMPLETE}'=='TRUE')   SO Test

diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index b16de5c..c2a0b3e 100755 (executable)
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -28,6 +28,7 @@ ${HB_VNF}
 Initialize Customer And Models
     [Tags]   InitDemo
     Load Customer And Models   Demonstration
+    Load Customer   SDN-ETHERNET-INTERNET
 
 Initialize SO Openstack Identity For V3
     [Tags]   InitDemo
@@ -106,3 +107,6 @@ Distribute Demo vFWDT Model
     [Timeout]    600
     Model Distribution For Directory    service=vFWDT   
 
+Download Service CSAR To Robot
+    [Tags]   downloadCsar
+    Download CSAR   ${CATALOG_SERVICE_ID}