summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore1
-rw-r--r--INFO.yaml139
-rw-r--r--robot/assets/templates/aai/add-connectivity.template21
-rw-r--r--robot/resources/aai/aai_interface.robot4
-rw-r--r--robot/resources/aai/api_version_properties.robot12
-rw-r--r--robot/resources/aai/ccvpn-connectivities.robot80
-rw-r--r--robot/resources/so_interface.robot20
-rw-r--r--robot/testsuites/aai/aai-regression-test-v14.robot18
8 files changed, 220 insertions, 75 deletions
diff --git a/.gitignore b/.gitignore
index cff1bcbc..1bae03cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/*.exe
/*.log
/*.zip
+.project
diff --git a/INFO.yaml b/INFO.yaml
index ec7e4af4..73ecee04 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -1,97 +1,108 @@
---
project: 'testsuite'
-project_creation_date: '2017-02-10'
+project_creation_date: '2017-02-15'
lifecycle_state: 'Incubation'
project_lead: &onap_releng_ptl
name: 'Yang Xu'
email: 'yang.xu3@huawei.com'
id: 'xuyang11'
company: 'Huawei'
- timezone: 'America/New York'
+ timezone: 'America/New_York'
primary_contact: *onap_releng_ptl
+project_category: ''
issue_tracking:
type: 'jira'
url: 'https://jira.onap.org/projects/TEST'
key: 'TEST'
+mailing_list:
+ type: 'groups.io'
+ url: 'lists.onap.org'
+ tag: '<[sub-project_name]>'
+realtime_discussion: ''
meetings:
- type: 'zoom'
- agenda: 'https://wiki.onap.org/display/DW/Integration+Meeting+Minutes'
- url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
- server: 'n/a'
- channel: 'n/a'
- repeats: 'weekly'
- time: '14:00 UTC'
+ agenda: 'https://wiki.onap.org/display/DW/Integration+Meeting+Minutes'
+ url: 'https://wiki.onap.org/pages/viewpage.action?pageId=6593670'
+ server: 'n/a'
+ channel: 'n/a'
+ repeats: 'weekly'
+ time: '14:00 UTC'
+repositories:
+ - 'testsuite'
+ - 'testsuite-heatbridge'
+ - 'testsuite-properties'
+ - 'testsuite-python-testing-utils'
committers:
- <<: *onap_releng_ptl
- name: 'Christophe Closset'
- email: 'cc697w@intl.att.com'
- company: 'ATT'
- id: 'ChrisC'
- timezone: 'Belgium/Namur'
+ email: 'cc697w@intl.att.com'
+ company: 'ATT'
+ id: 'ChrisC'
+ timezone: 'Belgium/Namur'
- name: 'Daniel Rose'
- email: 'DR695H@att.com'
- company: 'ATT'
- id: 'DR695H'
- timezone: 'America/New York'
+ email: 'DR695H@att.com'
+ company: 'ATT'
+ id: 'DR695H'
+ timezone: 'America/New_York'
- name: 'Gary Wu'
- email: 'gary.i.wu@huawei.com'
- company: 'Huawei'
- id: 'gwu'
- timezone: 'America/Santa Clara'
+ email: 'gary.i.wu@huawei.com'
+ company: 'Huawei'
+ id: 'gwu'
+ timezone: 'America/Santa_Clara'
- name: 'Hector Anapan-Lavalle'
- email: 'ha076r@att.com'
- company: 'ATT'
- id: 'ha076r'
- timezone: 'America/New York'
+ email: 'ha076r@att.com'
+ company: 'ATT'
+ id: 'ha076r'
+ timezone: 'America/New_York'
- name: 'He Rui'
- email: 'herui14@huawei.com'
- company: 'Huawei'
- id: 'Horry'
- timezone: 'China/Shenzhen'
+ email: 'herui14@huawei.com'
+ company: 'Huawei'
+ id: 'Horry'
+ timezone: 'China/Shenzhen'
- name: 'Xiaolong Kong'
- email: 'xiaolong.kong@orange.com'
- company: 'Orange'
- id: 'kong'
- timezone: 'France/Orange Gardens'
+ email: 'xiaolong.kong@orange.com'
+ company: 'Orange'
+ id: 'kong'
+ timezone: 'France/Orange_Gardens'
- name: 'Yuliang Liu'
- email: 'liuyuliang2@huawei.com'
- company: 'Huawei'
- id: 'liuyuliang'
- timezone: 'China/Xian'
+ email: 'liuyuliang2@huawei.com'
+ company: 'Huawei'
+ id: 'liuyuliang'
+ timezone: 'China/Xian'
- name: 'Anaël Closson'
- email: 'ac2550@intl.att.com'
- company: 'ATT'
- id: 'nabero'
- timezone: 'Belgium/Namur'
+ email: 'ac2550@intl.att.com'
+ company: 'ATT'
+ id: 'nabero'
+ timezone: 'Belgium/Namur'
- name: 'Marco Platania'
- email: 'platania@research.att.com'
- company: 'ATT'
- id: 'platania'
- timezone: 'America/New York'
+ email: 'platania@research.att.com'
+ company: 'ATT'
+ id: 'platania'
+ timezone: 'America/New_York'
- name: 'Ran Pollak'
- email: 'Ran.Pollak@amdocs.com'
- company: 'Amdocs'
- id: 'Ranpollak'
- timezone: 'Israel'
+ email: 'Ran.Pollak@amdocs.com'
+ company: 'Amdocs'
+ id: 'Ranpollak'
+ timezone: 'Asia/Jerusalem'
- name: 'Tracy Van Brakle'
- email: 'tv8394@att.com'
- company: 'ATT'
- id: 'tlvb0614'
- timezone: 'America/New York'
+ email: 'tv8394@att.com'
+ company: 'ATT'
+ id: 'tlvb0614'
+ timezone: 'America/New_York'
- name: 'Chengli Wang'
- email: 'wangchengli@chinamobile.com'
- company: 'China Mobile'
- id: 'wangchengli'
- timezone: 'China/Beijing'
+ email: 'wangchengli@chinamobile.com'
+ company: 'China Mobile'
+ id: 'wangchengli'
+ timezone: 'China/Beijing'
- name: 'Xing Xiaocheng'
- email: 'xingxiaocheng@huawei.com'
- company: 'Huawei'
- id: 'xingxiaocheng'
- timezone: 'China/Xian'
+ email: 'xingxiaocheng@huawei.com'
+ company: 'Huawei'
+ id: 'xingxiaocheng'
+ timezone: 'China/Xian'
- name: 'Brian Freeman'
- email: 'bf1936@att.com'
- company: 'AT&T'
- id: 'bdfreeman1421'
- timezone: 'America/New York'
+ email: 'bf1936@att.com'
+ company: 'AT&T'
+ id: 'bdfreeman1421'
+ timezone: 'America/New_York'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
diff --git a/robot/assets/templates/aai/add-connectivity.template b/robot/assets/templates/aai/add-connectivity.template
new file mode 100644
index 00000000..a693b208
--- /dev/null
+++ b/robot/assets/templates/aai/add-connectivity.template
@@ -0,0 +1,21 @@
+{
+ "connectivity-id": "${connectivity_id}",
+ "bandwidth-profile-name": "",
+ "vpn-type": "",
+ "cir": "",
+ "eir": "",
+ "cbs": "",
+ "ebs": "",
+ "color-aware": "",
+ "coupling-flag": "",
+ "etht-svc-name": "",
+ "access-provider-id": "",
+ "access-client-id": "",
+ "access-topology-id": "",
+ "access-node-id": "",
+ "access-ltp-id": "",
+ "connectivity-selflink": "",
+ "cvlan": "",
+ "operational-status": "",
+ "resource-version": ""
+}
diff --git a/robot/resources/aai/aai_interface.robot b/robot/resources/aai/aai_interface.robot
index b72103d0..c0600064 100644
--- a/robot/resources/aai/aai_interface.robot
+++ b/robot/resources/aai/aai_interface.robot
@@ -68,12 +68,12 @@ Run A&AI Delete Request
Delete A&AI Entity
[Documentation] Deletes an entity in A&AI
[Arguments] ${uri}
- ${get_resp}= Run A&AI Get Request ${VERSIONED_INDEX PATH}${uri}
+ ${get_resp}= Run A&AI Get Request ${VERSIONED_INDEX_PATH}${uri}
Run Keyword If '${get_resp.status_code}' == '200' Delete A&AI Entity Exists ${uri} ${get_resp.json()['resource-version']}
Delete A&AI Entity Exists
[Documentation] Deletes an A&AI entity
[Arguments] ${uri} ${resource_version_id}
- ${put_resp}= Run A&AI Delete Request ${VERSIONED_INDEX PATH}${uri} ${resource_version_id}
+ ${put_resp}= Run A&AI Delete Request ${VERSIONED_INDEX_PATH}${uri} ${resource_version_id}
Should Be Equal As Strings ${put_resp.status_code} 204
diff --git a/robot/resources/aai/api_version_properties.robot b/robot/resources/aai/api_version_properties.robot
new file mode 100644
index 00000000..17ba9de5
--- /dev/null
+++ b/robot/resources/aai/api_version_properties.robot
@@ -0,0 +1,12 @@
+*** Settings ***
+Documentation store all properties that can change or are used in multiple places here
+... format is all caps with underscores between words and prepended with AAI
+... make sure you prepend them with AAI so that other files can easily see it is from this file.
+
+
+*** Variables ***
+${AAI_AMSTERDAM_INDEX_PATH} /aai/v11
+${AAI_BEIJING_INDEX_PATH} /aai/v13
+${AAI_CASABLANCA_INDEX_PATH} /aai/v14
+${AAI_DUBLIN_INDEX_PATH} /aai/v16
+
diff --git a/robot/resources/aai/ccvpn-connectivities.robot b/robot/resources/aai/ccvpn-connectivities.robot
new file mode 100644
index 00000000..e4d7bd51
--- /dev/null
+++ b/robot/resources/aai/ccvpn-connectivities.robot
@@ -0,0 +1,80 @@
+*** Settings ***
+Documentation Operations on connectivities in AAI for CCVPN use case, using earliest API version where it is implemented and latest API version where it is not implemented
+
+Resource ../json_templater.robot
+Resource aai_interface.robot
+Resource api_version_properties.robot
+Library OperatingSystem
+Library Collections
+
+
+*** Variables ***
+${AAI_CONN_ROOT_PATH} /network/connectivities/connectivity
+${AAI_CONN_EXAMPLES_PATH} /examples/connectivities
+${AAI_CONN_NODES_PATH} /nodes/connectivities
+${AAI_ADD_CONNECTIVITY_BODY}= robot/assets/templates/aai/add-connectivity.template
+${AAI_CONN_API_NA_INDEX_PATH}= ${AAI_BEIJING_INDEX_PATH}
+${AAI_CONN_API_IMPL_INDEX_PATH}= ${AAI_CASABLANCA_INDEX_PATH}
+
+*** Keywords ***
+Create Connectivity If Not Exists
+ [Documentation] Creates Connectivity in AAI if it doesn't exist
+ [Arguments] ${connectivity_id}
+ ${get_resp}= Run A&AI Get Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id}
+ Return From Keyword If '${get_resp.status_code}' == '200'
+ Create Connectivity ${connectivity_id}
+
+Create Connectivity
+ [Documentation] Creates Connectivity in AAI
+ [Arguments] ${connectivity_id}
+ ${arguments}= Create Dictionary connectivity_id=${connectivity_id}
+ ${data}= Fill JSON Template File ${AAI_ADD_CONNECTIVITY_BODY} ${arguments}
+ ${put_resp}= Run A&AI Put Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id} ${data}
+ ${status_string}= Convert To String ${put_resp.status_code}
+ Should Match Regexp ${status_string} ^(201|200)$
+
+Delete Connectivity If Exists
+ [Documentation] Removes Connectivity from AAI if it exists
+ [Arguments] ${connectivity_id}
+ ${get_resp}= Run A&AI Get Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id}
+ Run Keyword If '${get_resp.status_code}' == '200' Delete Connectivity ${connectivity_id} ${get_resp.json()}
+
+Delete Connectivity
+ [Documentation] Removes Connectivity from AAI
+ [Arguments] ${connectivity_id} ${json}
+ ${resource_version}= Catenate ${json['resource-version']}
+ ${put_resp}= Run A&AI Delete Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id} ${resource_version}
+ Should Be Equal As Strings ${put_resp.status_code} 204
+
+Get Connectivity
+ [Documentation] Return Connectivity
+ [Arguments] ${connectivity_id}
+ ${resp}= Run A&AI Get Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id}
+ Should Be Equal As Strings ${resp.status_code} 200
+ [Return] ${resp.json()}
+
+Get Nodes Query Connectivity
+ [Documentation] Return Nodes query Connectivity
+ [Arguments] ${connectivity_id}
+ ${resp}= Run A&AI Get Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_NODES_PATH}?connectivity-id=${connectivity_id}
+ Should Be Equal As Strings ${resp.status_code} 200
+ [Return] ${resp.json()}
+
+Get Example Connectivity
+ [Documentation] Return Example Connectivity
+ ${resp}= Run A&AI Get Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_EXAMPLES_PATH}
+ Should Be Equal As Strings ${resp.status_code} 200
+ [Return] ${resp.json()}
+
+Confirm No Connectivity
+ [Documentation] Confirm No Connectivity
+ [Arguments] ${connectivity_id}
+ ${resp}= Run A&AI Get Request ${AAI_CONN_API_IMPL_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id}
+ Should Be Equal As Strings ${resp.status_code} 404
+
+Confirm API Not Implemented Connectivity
+ [Documentation] Confirm latest API version where Connectivity is not implemented
+ [Arguments] ${connectivity_id}
+ ${resp}= Run A&AI Get Request ${AAI_CONN_API_NA_INDEX_PATH}${AAI_CONN_ROOT_PATH}/${connectivity_id}
+ Should Be Equal As Strings ${resp.status_code} 400
+
diff --git a/robot/resources/so_interface.robot b/robot/resources/so_interface.robot
index bc0aa3c0..0bb4f49a 100644
--- a/robot/resources/so_interface.robot
+++ b/robot/resources/so_interface.robot
@@ -17,22 +17,24 @@ ${SO_OPENSTACK_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_S
${SO_REQDB_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_REQDB_IP_ADDR}:${GLOBAL_MSO_REQDB_SERVER_PORT}
${SO_SDNC_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_SDNC_IP_ADDR}:${GLOBAL_MSO_SDNC_SERVER_PORT}
${SO_VFC_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_VFC_IP_ADDR}:${GLOBAL_MSO_VFC_SERVER_PORT}
+${SO_VNFM_ENDPOINT} ${GLOBAL_MSO_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SO_VNFM_IP_ADDR}:${GLOBAL_MSO_VNFM_SERVER_PORT}
*** Keywords ***
Run SO Global Health Check
- Run SO Container Health Check API_HANDLER ${SO_APIHAND_ENDPOINT}
- Run SO Container Health Check ASDC_HANDLER ${SO_ASDCHAND_ENDPOINT}
- Run SO Container Health Check BPMN_INFRA ${SO_BPMN_ENDPOINT}
- Run SO Container Health Check CATALOG_DB ${SO_CATDB_ENDPOINT}
- Run SO Container Health Check OPENSTACK_INFRA ${SO_OPENSTACK_ENDPOINT}
- Run SO Container Health Check REQUEST_DB ${SO_REQDB_ENDPOINT}
- Run SO Container Health Check SDNC_INFRA ${SO_SDNC_ENDPOINT}
- Run SO Container Health Check VFC_INFRA ${SO_VFC_ENDPOINT}
+ Run SO Container Health Check API_HANDLER ${SO_APIHAND_ENDPOINT}
+ Run SO Container Health Check ASDC_HANDLER ${SO_ASDCHAND_ENDPOINT}
+ Run SO Container Health Check BPMN_INFRA ${SO_BPMN_ENDPOINT}
+ Run SO Container Health Check CATALOG_DB ${SO_CATDB_ENDPOINT}
+ Run SO Container Health Check OPENSTACK_INFRA ${SO_OPENSTACK_ENDPOINT}
+ Run SO Container Health Check REQUEST_DB ${SO_REQDB_ENDPOINT}
+ Run SO Container Health Check SDNC_INFRA ${SO_SDNC_ENDPOINT}
+ Run SO Container Health Check VFC_INFRA ${SO_VFC_ENDPOINT}
+ Run SO Container Health Check VNFM_INFRA ${SO_VNFM_ENDPOINT}
Run SO Container Health Check
[Documentation] Runs an MSO global health check
- [Arguments] ${so_endpoint_label} ${so_endpoint}
+ [Arguments] ${so_endpoint_label} ${so_endpoint}
${auth}= Create List ${GLOBAL_MSO_USERNAME} ${GLOBAL_MSO_PASSWORD}
${session}= Create Session mso ${so_endpoint}
${uuid}= Generate UUID
diff --git a/robot/testsuites/aai/aai-regression-test-v14.robot b/robot/testsuites/aai/aai-regression-test-v14.robot
new file mode 100644
index 00000000..ab43776d
--- /dev/null
+++ b/robot/testsuites/aai/aai-regression-test-v14.robot
@@ -0,0 +1,18 @@
+*** Settings ***
+Documentation AAI CSIT-style regression tests for CCVPN - new schema elements introduced in Casablanca release for CCVPN use case
+Default Tags aai csit ccvpn
+Test Timeout 10s
+Resource ${EXECDIR}/robot/resources/aai/ccvpn-connectivities.robot
+
+*** Variables ***
+${connectivity_id}= robot-connectivity-test-1
+
+*** Test Cases ***
+Connectivity test case
+ Confirm API Not Implemented Connectivity ${connectivity_id}
+ Confirm No Connectivity ${connectivity_id}
+ Create Connectivity If Not Exists ${connectivity_id}
+ Get Connectivity ${connectivity_id}
+ Delete Connectivity If Exists ${connectivity_id}
+ Confirm No Connectivity ${connectivity_id}
+ [Teardown] Delete Connectivity If Exists ${connectivity_id}