Merge "Add support for ODL credentials that have changed"

8 files changed, 35 insertions, 27 deletions

diff --git a/test/csit/plans/appc/healthcheck/health_check.sh b/test/csit/plans/appc/healthcheck/health_check.sh
index e4cfae8f5..775188f64 100755
--- a/test/csit/plans/appc/healthcheck/health_check.sh
+++ b/test/csit/plans/appc/healthcheck/health_check.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 ###############################################################################
-# Copyright 2017 Huawei Technologies Co., Ltd.
+# Copyright 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo $SCRIPTS
 
-response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46YWRtaW4=" -X POST -H "X-FromAppId: csit-appc" -H "X-TransactionId: csit-appc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck )
+response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-appc" -H "X-TransactionId: csit-appc" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8282/restconf/operations/SLI-API:healthcheck )
 
 if [ "$response" == "200" ]; then
     echo "APPC health check passed."
diff --git a/test/csit/tests/appc/cdt/cdt.robot b/test/csit/tests/appc/cdt/cdt.robot
index 03ba3a4f9..b33bfe778 100644
--- a/test/csit/tests/appc/cdt/cdt.robot
+++ b/test/csit/tests/appc/cdt/cdt.robot
@@ -43,11 +43,14 @@
 | | Click Link | MY VNFs
 # Verify button element is ready before clicking it.
 | | Wait Until Page Contains Element | xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) | ${LONGTIME}
-| | Click Button | Create New VNF Type or VNFC Type
-| | Page Should Contain | Enter VNF type and VNFC to proceed
+#| | Click Button | Create New VNF Type or VNFC Type
+| | Click Button | Create New VNF Type
+#| | Page Should Contain | Enter VNF type and VNFC to proceed
+| | Page Should Contain | Enter VNF Type
 | | Page Should Contain Element | id=vnfType
 # Proceed without entering any new information
-| | Click Button | Proceed anyway
+#| | Click Button | Proceed anyway
+| | Click Button | Proceed To Upload
 | | Page Should Contain Element | id=cmbAction
 | | Click Button | Upload Reference File
 | | Choose File | id=inputFile |  ${CURDIR}/data/reference_AllAction_HealthCheckAnsible_0.0.1V.json
@@ -66,8 +69,10 @@
 | | Click Link | MY VNFs
 # Verify button element is ready before clicking it.
 | | Wait Until Page Contains Element | xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) | ${LONGTIME}
-| | Click Button | Create New VNF Type or VNFC Type
-| | Page Should Contain | Enter VNF type and VNFC to proceed
+#| | Click Button | Create New VNF Type or VNFC Type
+| | Click Button | Create New VNF Type
+#| | Page Should Contain | Enter VNF type and VNFC to proceed
+| | Page Should Contain | Enter VNF Type
 | | Page Should Contain Element | id=vnfType
 # Create a date to use in VNF Type to make it unique
 | | ${THEDATE}  | Get Current Date | result_format=%m%d%H%M%S | exclude_millis=True
@@ -93,7 +98,8 @@
 | | Click Link | MY VNFs
 # Verify button element is ready before clicking it.
 | | Wait Until Page Contains Element | xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) | ${LONGTIME}
-| | Click Button | Create New VNF Type or VNFC Type
+#| | Click Button | Create New VNF Type or VNFC Type
+| | Click Button | Create New VNF Type
 | | Wait Until Page Contains Element | id=vnfType | ${LONGTIME}
 # Create a date to use in VNF Type to make it unique
 | | ${THEDATE}  | Get Current Date | result_format=%m%d%H%M%S | exclude_millis=True
@@ -142,14 +148,15 @@
 | | Click Link | MY VNFs
 # Verify button element is ready before clicking it.
 | | Wait Until Page Contains Element | xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) | ${LONGTIME}
-| | Click Button | Create New VNF Type or VNFC Type
+#| | Click Button | Create New VNF Type or VNFC Type
+| | Click Button | Create New VNF Type
 | | Wait Until Page Contains Element | id=vnfType | ${LONGTIME}
 # Create a date to use in VNF Type to make it unique
 | | ${THEDATE}  | Get Current Date | result_format=%m%d%H%M%S | exclude_millis=True
 | | Input Text | id=vnfType | csit${THEDATE}
 # Check the box indicating VNFC templates
 | | Select Checkbox | id=vnfcRequired
-| | Input Text | id=vnfcType | csitVNFC
+#| | Input Text | id=vnfcType | csitVNFC
 | | Click Button | Next
 | | Wait Until Page Contains Element | id=cmbAction | ${LONGTIME}
 # Populate the action and protocol
diff --git a/test/csit/tests/appc/cdt/data/pd_Configure_vUSP - Revenue Assurance_0.0.1V.yaml b/test/csit/tests/appc/cdt/data/pd_Configure_vUSP - Revenue Assurance_0.0.1V.yaml
index cea00f0f9..ced4a7c58 100755
--- a/test/csit/tests/appc/cdt/data/pd_Configure_vUSP - Revenue Assurance_0.0.1V.yaml
+++ b/test/csit/tests/appc/cdt/data/pd_Configure_vUSP - Revenue Assurance_0.0.1V.yaml
@@ -4,7 +4,7 @@ version: V1
 vnf-parameter-list:
 - name: vnf_name
   type: null
-  description: dawnDescript
+  description: CSIT
   required: null
   default: null
   source: Manual
diff --git a/test/csit/tests/appc/cdt/data/reference_AllAction_HealthCheckAnsible_0.0.1V.json b/test/csit/tests/appc/cdt/data/reference_AllAction_HealthCheckAnsible_0.0.1V.json
index 90fd0acd5..416780615 100755
--- a/test/csit/tests/appc/cdt/data/reference_AllAction_HealthCheckAnsible_0.0.1V.json
+++ b/test/csit/tests/appc/cdt/data/reference_AllAction_HealthCheckAnsible_0.0.1V.json
@@ -5,7 +5,7 @@
 			"action-level": "vnf",
 			"scope": {
 				"vnf-type": "csit",
-				"vnfc-type-list": [],
+				"vnfc-type-list": ["testvnftype"],
 				"vnfc-type": ""
 			},
 			"template": "Y",
@@ -15,15 +15,15 @@
 			"port-number": "",
 			"artifact-list": [
 				{
-					"artifact-name": "template_HealthCheck_dawnMay17_0.0.1V.json",
+					"artifact-name": "template_HealthCheck_csit_0.0.1V.json",
 					"artifact-type": "config_template"
 				},
 				{
-					"artifact-name": "pd_HealthCheck_dawnMay17_0.0.1V.yaml",
+					"artifact-name": "pd_HealthCheck_csit_0.0.1V.yaml",
 					"artifact-type": "parameter_definitions"
 				},
 				{
-					"artifact-name": "param_HealthCheck_dawnMay17_0.0.1V.json",
+					"artifact-name": "param_HealthCheck_csit_0.0.1V.json",
 					"artifact-type": "param_values"
 				}
 			],
@@ -34,12 +34,12 @@
 			"action-level": "vnf",
 			"scope": {
 				"vnf-type": "csit",
-				"vnfc-type-list": [],
+				"vnfc-type-list": ["testvnftype"],
 				"vnfc-type": ""
 			},
 			"artifact-list": [
 				{
-					"artifact-name": "reference_AllAction_dawnMay17_0.0.1V.json",
+					"artifact-name": "reference_AllAction_csit_0.0.1V.json",
 					"artifact-type": "reference_template"
 				}
 			]
diff --git a/test/csit/tests/appc/cdt/data/reference_AllAction_vUSP - Revenue Assurance_0.0.1V.json b/test/csit/tests/appc/cdt/data/reference_AllAction_vUSP - Revenue Assurance_0.0.1V.json
index f78debef4..a575129f0 100755
--- a/test/csit/tests/appc/cdt/data/reference_AllAction_vUSP - Revenue Assurance_0.0.1V.json
+++ b/test/csit/tests/appc/cdt/data/reference_AllAction_vUSP - Revenue Assurance_0.0.1V.json
@@ -5,6 +5,7 @@
 			"action-level": "vnf",
 			"scope": {
 				"vnf-type": "vUSP - Revenue Assurance",
+				"vnf-type-list": "testvnftype",
 				"vnfc-type": ""
 			},
 			"template": "Y",
@@ -61,7 +62,7 @@
 			"scope": {
 				"vnf-type": "vUSP - Revenue Assurance",
 				"vnfc-type": "",
-				"vnfc-type-list": []
+				"vnfc-type-list": ["testvnftype"]
 			},
 			"template": "Y",
 			"vm": [],
@@ -86,7 +87,7 @@
 			"scope": {
 				"vnf-type": "vUSP - Revenue Assurance",
 				"vnfc-type": "",
-				"vnfc-type-list": []
+				"vnfc-type-list": ["testvnftype"]
 			},
 			"template": "Y",
 			"vm": [],
@@ -111,7 +112,7 @@
 			"scope": {
 				"vnf-type": "vUSP - Revenue Assurance",
 				"vnfc-type": "",
-				"vnfc-type-list": []
+				"vnfc-type-list": ["testvnftype"]
 			},
 			"artifact-list": [
 				{
@@ -121,4 +122,4 @@
 			]
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot b/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot
index cfba50b8d..1cea75e90 100644
--- a/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot
+++ b/test/csit/tests/appc/healthcheck/LCM_HEALTHCHECK_TIMESTAMP.robot
@@ -14,8 +14,8 @@ ${var}
 APPC LCM API HEALTHCHECK
 	[Documentation]	APPC LCM API HEALTHCHECK 
 	Start Virtual Display     1920     1080
-	Open Browser    http://admin:admin@localhost:8282/apidoc/explorer/index.html	chrome
-	Maximize Browser Window 
+	Open Browser    http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8282/apidoc/explorer/index.html	chrome
+#	Maximize Browser Window 
 #	Click Element    xpath=.//p[contains(text(),'If you have reason to expect the website is safe, select the I Accept the Risk button to continue.')]//following::img
 
 	Reload Page
diff --git a/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot b/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot
index 98a8e584c..7968d5526 100644
--- a/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot
+++ b/test/csit/tests/appc/healthcheck/LCM_VM_RESTART_TIMESTAMP.robot
@@ -13,8 +13,8 @@ ${var}
 APPC LCM API VM RESTART
 	[Documentation]	APPC LCM API VM RESTART 
 	Start Virtual Display     1920     1080
-	Open Browser    http://admin:admin@localhost:8282/apidoc/explorer/index.html    chrome
-	Maximize Browser Window
+	Open Browser    http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8282/apidoc/explorer/index.html    chrome
+#	Maximize Browser Window
 #	Click Element    xpath=.//p[contains(text(),'If you have reason to expect the website is safe, select the I Accept the Risk button to continue.')]//following::img
 	
 	Reload Page
diff --git a/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot b/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot
index 0f550d343..93c72d725 100644
--- a/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot
+++ b/test/csit/tests/appc/healthcheck/LCM_VNF_RESTART_TIMESTAMP.robot
@@ -16,8 +16,8 @@ ${var}
 APPC LCM API VNF RESTART
 	[Documentation]	APPC LCM API VNF RESTART 
 	Start Virtual Display     1920     1080
-	Open Browser    http://admin:admin@localhost:8282/apidoc/explorer/index.html    chrome
-	Maximize Browser Window
+	Open Browser    http://admin:Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U@localhost:8282/apidoc/explorer/index.html    chrome
+#	Maximize Browser Window
 #	Click Element    xpath=.//p[contains(text(),'If you have reason to expect the website is safe, select the I Accept the Risk button to continue.')]//following::img
 	
 	Reload Page