summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Hay <ah415j@att.com>2018-08-05 13:01:17 -0400
committerAaron Hay <ah415j@att.com>2018-08-13 17:12:43 -0400
commitc3f081d1107c8c82399fb193779b0ac3e121dd91 (patch)
tree48da3ba8abb4894bf2f6b1075ab116fe0625a1fa
parent644ca6a36498c72e93977413529500fdf1c72eea (diff)
Add APPC CDT preload capability
Add template files and update the demo and appc interface files to support APPC CDT preload capability. Change-Id: I975a9bd0490b388e921ad5f6d21d021eff64f6ce Issue-ID: APPC-914 Signed-off-by: Aaron Hay <ah415j@att.com>
-rw-r--r--robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml31
-rw-r--r--robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json46
-rw-r--r--robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml9
-rw-r--r--robot/resources/appc_interface.robot45
-rw-r--r--robot/testsuites/demo.robot8
5 files changed, 139 insertions, 0 deletions
diff --git a/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml b/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml
new file mode 100644
index 00000000..8b308dcb
--- /dev/null
+++ b/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml
@@ -0,0 +1,31 @@
+---
+kind: "Property Definition"
+version: V1
+vnf-parameter-list:
+- name: ip-addr
+ type: null
+ description: null
+ required: "true"
+ default: null
+ source: Manual
+ rule-type: null
+ request-keys: null
+ response-keys: null
+- name: oam-ip-addr
+ type: null
+ description: null
+ required: "true"
+ default: null
+ source: Manual
+ rule-type: null
+ request-keys: null
+ response-keys: null
+- name: enabled
+ type: null
+ description: null
+ required: "true"
+ default: null
+ source: Manual
+ rule-type: null
+ request-keys: null
+ response-keys: null
diff --git a/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json b/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json
new file mode 100644
index 00000000..137cb7a6
--- /dev/null
+++ b/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json
@@ -0,0 +1,46 @@
+{
+ "reference_data": [
+ {
+ "action": "ConfigScaleOut",
+ "action-level": "vnf",
+ "scope": {
+ "vnf-type": "vLoadBalancer/vLoadBalancer-test 0",
+ "vnfc-type": ""
+ },
+ "template": "Y",
+ "vm": [],
+ "device-protocol": "NETCONF-XML",
+ "user-name": "admin",
+ "port-number": "2831",
+ "artifact-list": [
+ {
+ "artifact-name": "template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml",
+ "artifact-type": "config_template"
+ },
+ {
+ "artifact-name": "pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml",
+ "artifact-type": "parameter_definitions"
+ }
+ ],
+ "template-id-list": [
+ "vLB"
+ ],
+ "template-id": "vLB",
+ "scopeType": "vnf-type"
+ },
+ {
+ "action": "AllAction",
+ "action-level": "vnf",
+ "scope": {
+ "vnf-type": "vLoadBalancer/vLoadBalancer-test 0",
+ "vnfc-type": ""
+ },
+ "artifact-list": [
+ {
+ "artifact-name": "reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json",
+ "artifact-type": "reference_template"
+ }
+ ]
+ }
+ ]
+} \ No newline at end of file
diff --git a/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml b/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml
new file mode 100644
index 00000000..61d24976
--- /dev/null
+++ b/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml
@@ -0,0 +1,9 @@
+<vlb-business-vnf-onap-plugin xmlns="urn:opendaylight:params:xml:ns:yang:vlb-business-vnf-onap-plugin">
+ <vdns-instances>
+ <vdns-instance>
+ <ip-addr>${ip-addr}</ip-addr>
+ <oam-ip-addr>${oam-ip-addr}</oam-ip-addr>
+ <enabled>${enabled}</enabled>
+ </vdns-instance>
+ </vdns-instances>
+</vlb-business-vnf-onap-plugin> \ No newline at end of file
diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot
index 5c3d8636..91c44c63 100644
--- a/robot/resources/appc_interface.robot
+++ b/robot/resources/appc_interface.robot
@@ -12,6 +12,12 @@ ${APPC_HEALTHCHECK_OPERATION_PATH} /operations/SLI-API:healthcheck
${APPC_CREATE_MOUNTPOINT_PATH} /config/network-topology:network-topology/topology/topology-netconf/node/
${APPC_MOUNT_XML} robot/assets/templates/appc/vnf_mount.template
${APPC_ENDPOINT} ${GLOBAL_APPC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_IP_ADDR}:${GLOBAL_APPC_SERVER_PORT}
+${APPC_CDT_Config_Scaleout} ${EXECDIR}/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml
+${APPC_CDT_Config_Scaleout_PD} ${EXECDIR}/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml
+${APPC_CDT_Config_Scaleout_REF} ${EXECDIR}/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json
+${APPC_CDT_Config_Scaleout_REF_name} reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json
+${APPC_CDT_ENDPOINT} ${GLOBAL_APPC_CDT_SERVER_PROTOCOL}://${GLOBAL_INJECTED_APPC_CDT_IP_ADDR}:${GLOBAL_APPC_CDT_SERVER_PORT}
+${APPC_CDT_LOGIN_URL} ${APPC_CDT_ENDPOINT}/index.html
*** Keywords ***
@@ -54,3 +60,42 @@ Create Mount Point In APPC
${resp}= Run APPC Put Request ${APPC_INDEX PATH}${APPC_CREATE_MOUNTPOINT_PATH}${nodeid} ${data}
Should Be True 200 <= ${resp.status_code} < 300
[Return] ${resp}
+
+Preload APPC CDT GUI
+ [Documentation] APPC CDT GUI Preload
+ [Arguments] ${username}=${GLOBAL_APPC_CDT_USERNAME} ${reference_file_name}=${APPC_CDT_Config_Scaleout_REF_name} ${reference_file}=${APPC_CDT_Config_Scaleout_REF} ${template_file}=${APPC_CDT_Config_Scaleout} ${parameterdefinition_file}=${APPC_CDT_Config_Scaleout_PD}
+ # Setup Browser Now being managed by test case
+ ##Setup Browser
+ Go To ${APPC_CDT_LOGIN_URL}#/home
+ Set Selenium Speed ${GLOBAL_SELENIUM_DELAY}
+ Set Browser Implicit Wait ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}
+ Log Logging in to ${APPC_CDT_ENDPOINT}
+ Handle Proxy Warning
+ Wait Until Page Contains WELCOME ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
+ Go To ${APPC_CDT_LOGIN_URL}#/vnfs
+ Wait Until Element Is Visible id=userId ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
+ Input Text id=userId ${username}
+ Click Button Submit
+ Page Should Contain ${username}
+ Wait Until Page Contains Element xpath=(//*[@class='mdl-button mdl-js-button mdl-button--raised mdl-js-ripple-effect mdl-button--primary']) ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
+ Click Button Create New VNF Type or VNFC Type
+ Page Should Contain Enter VNF type and VNFC to proceed
+ Click Button Proceed anyway
+ Click Button Upload Reference File
+ Choose File id=inputFile ${reference_file}
+ Select From List By Value name=templateIdentifier vLB
+ Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}
+ Click Link Template
+ Click Button Upload Template File
+ Choose File id=inputFile ${template_file}
+ Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}
+ Click Link Parameter Definition
+ Click Button UPLOAD PD FILE
+ Choose File id=inputFile1 ${parameterdefinition_file}
+ Sleep ${GLOBAL_SELENIUM_BROWSER_IMPLICIT_WAIT}
+ Click Link Reference Data
+ Select From List By Value name=templateIdentifier vLB
+ Click Button saveToAppc
+ Go To ${APPC_CDT_LOGIN_URL}#/vnfs
+ Wait Until Page Contains ${reference_file_name} ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
+ Log Logged in to ${APPC_CDT_ENDPOINT}
diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index 216d3091..a6c6cb8f 100644
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -59,3 +59,11 @@ Run Heatbridge
[Tags] heatbridge
Execute Heatbridge ${HB_STACK} ${HB_SERVICE_INSTANCE_ID} ${HB_SERVICE} ${HB_IPV4_OAM_ADDRESS}
+Preload APPC CDT GUI
+ [Documentation]
+ ... APPC CDT Preload Demo
+ [Tags] APPCCDTPreloadDemo
+ Setup Browser
+ Preload APPC CDT GUI
+# Preload APPC CDT GUI demo reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json ${EXECDIR}/robot/assets/templates/appc/reference_AllAction_vLoadBalancer_vLoadBalancer-test0_0.0.1V.json ${EXECDIR}/robot/assets/templates/appc/template_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.xml ${EXECDIR}/robot/assets/templates/appc/pd_ConfigScaleOut_vLoadBalancer_vLoadBalancer-test0_0.0.1V_vLB.yaml
+