aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMariusz Wagner <mariusz.wagner@nokia.com>2019-07-08 09:35:00 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-08 09:35:00 +0000
commit86d3211823bf4cb79d296b659551fb7785bd5c2d (patch)
treee795c75e4a035223bbe2f71c1a5b13e35337cf18
parentfc343855f914ddcdf4682cdc6f478259644dd869 (diff)
parentc4a9b7efe4f438901a68be7213ecba78df5cdb02 (diff)
Merge "Bbs tests improvements"
-rw-r--r--tests/dcaegen2/prh-testcases/assets/re-registration/expected-logical-link.json22
-rw-r--r--tests/dcaegen2/prh-testcases/assets/re-registration/expected-pnf-update-event.json3
-rw-r--r--tests/dcaegen2/prh-testcases/assets/re-registration/ves-event.json3
-rw-r--r--tests/dcaegen2/prh-testcases/prh_tests.robot2
-rw-r--r--tests/dcaegen2/prh-testcases/resources/prh_library.robot24
-rw-r--r--tests/dcaegen2/prh-testcases/resources/simulator/AAI.py27
6 files changed, 26 insertions, 55 deletions
diff --git a/tests/dcaegen2/prh-testcases/assets/re-registration/expected-logical-link.json b/tests/dcaegen2/prh-testcases/assets/re-registration/expected-logical-link.json
deleted file mode 100644
index 0e4f6ab1..00000000
--- a/tests/dcaegen2/prh-testcases/assets/re-registration/expected-logical-link.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "link-name": "bbs-link",
- "in-maint": false,
- "link-type": "attachment-point",
- "relationship-list":
- {
- "relationship": [
- {
- "related-to": "pnf",
- "relationship-label": "org.onap.relationships.inventory.BridgedTo",
- "related-link": "/network/pnfs/pnf/NOK6061ZW9",
- "relationship-data": [
- {
- "relationship-key": "pnf.pnf-name",
- "relationship-value": "NOK6061ZW9"
- }
- ]
- }
- ]
- }
-}
-
diff --git a/tests/dcaegen2/prh-testcases/assets/re-registration/expected-pnf-update-event.json b/tests/dcaegen2/prh-testcases/assets/re-registration/expected-pnf-update-event.json
index d1787797..48341b69 100644
--- a/tests/dcaegen2/prh-testcases/assets/re-registration/expected-pnf-update-event.json
+++ b/tests/dcaegen2/prh-testcases/assets/re-registration/expected-pnf-update-event.json
@@ -1,7 +1,8 @@
[
{
"additionalFields": {
- "attachment-point": "another-link"
+ "attachment-point": "another-link",
+ "some-param": "param"
},
"correlationId": "NOK6061ZW9"
}
diff --git a/tests/dcaegen2/prh-testcases/assets/re-registration/ves-event.json b/tests/dcaegen2/prh-testcases/assets/re-registration/ves-event.json
index ef75a884..f02d7343 100644
--- a/tests/dcaegen2/prh-testcases/assets/re-registration/ves-event.json
+++ b/tests/dcaegen2/prh-testcases/assets/re-registration/ves-event.json
@@ -33,7 +33,8 @@
"oamV6IpAddress": "val4",
"softwareVersion": "val7",
"additionalFields": {
- "attachment-point": "another-link"
+ "attachment-point": "another-link",
+ "some-param": "param"
}
}
}
diff --git a/tests/dcaegen2/prh-testcases/prh_tests.robot b/tests/dcaegen2/prh-testcases/prh_tests.robot
index c8297ec6..2491bd1b 100644
--- a/tests/dcaegen2/prh-testcases/prh_tests.robot
+++ b/tests/dcaegen2/prh-testcases/prh_tests.robot
@@ -53,7 +53,7 @@ Should not send PNF ready when AAI is not responding
Should send PNF ready when logical link exists and replace it in AAI
[Documentation] PRH gets event from DMaaP with an attachment point, PNF is related to a logical link in AAI
[Tags] PRH Attachment point
- [Template] Verify PNF ready sent and old logical link removed from AAI
+ [Template] Verify PNF ready sent and old logical link replaced in AAI
${TEST_CASES_DIR}/pnf-with-existing-logical-link
${TEST_CASES_DIR}/pnf-with-different-logical-link
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index cf3f1097..892ee523 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -15,12 +15,13 @@ Verify PNF ready sent
Wait Until Keyword Succeeds 10x 3000ms Check CBS ready
Wait Until Keyword Succeeds 10x 3000ms Check created PNF_READY notification ${expected_pnf_ready_event}
-Verify PNF ready sent and old logical link removed from AAI
+Verify PNF ready sent and old logical link replaced in AAI
[Arguments] ${test_case_directory}
${logical_link}= Get Data From File ${test_case_directory}/logical-link.json
+ ${expected_logical_link}= Get Data From File ${test_case_directory}/expected-logical-link.json
Add logical link entry in AAI ${logical_link}
Verify PNF ready sent ${test_case_directory}
- Wait Until Keyword Succeeds 10x 3000ms Check no logical link in AAI ${test_case_directory}
+ Wait Until Keyword Succeeds 10x 3000ms Check created Logical Link ${expected_logical_link}
Verify PNF ready sent and logical link created
[Arguments] ${test_case_directory}
@@ -95,13 +96,8 @@ Verify PNF ready sent when service instance non active
Check logical link not modified
[Arguments] ${test_case_directory}
${expected_logical_link}= Get Data From File ${test_case_directory}/logical-link.json
- ${actual_logical_link}= Get Request ${aai_session} /verify/logical-link/bbs-link headers=${suite_headers}
- Should Be Equal As JSON ${expected_logical_link} ${actual_logical_link.content}
-
-Check no logical link in AAI
- [Arguments] ${test_case_directory}
- ${logical_links}= Get Request ${aai_session} /verify/logical-links headers=${suite_headers}
- Should Be Equal As JSON {} ${logical_links.content}
+ ${existing_logical_link}= Get Request ${aai_session} /verify/logical-link headers=${suite_headers}
+ Should Be Equal As JSON ${expected_logical_link} ${existing_logical_link.content}
Check CBS ready
${resp}= Get Request ${consul_session} /v1/catalog/services
@@ -110,21 +106,21 @@ Check CBS ready
Dictionary Should Contain Key ${resp.json()} cbs |Consul service catalog should contain CBS entry
Check created PNF_READY notification
- [Arguments] ${expected_event_pnf_ready_in_dpaap}
+ [Arguments] ${expected_event_pnf_ready_in_dmaap}
${resp}= Get Request ${dmaap_session} /verify/pnf_ready headers=${suite_headers}
Should Be Equal As Strings ${resp.status_code} 200
- Should Be Equal As JSON ${resp.content} ${expected_event_pnf_ready_in_dpaap}
+ Should Be Equal As JSON ${resp.content} ${expected_event_pnf_ready_in_dmaap}
Check created PNF_UPDATE notification
- [Arguments] ${expected_event_pnf_update_in_dpaap}
+ [Arguments] ${expected_event_pnf_update_in_dmaap}
${resp}= Get Request ${dmaap_session} /verify/pnf_update headers=${suite_headers}
Log Response from DMaaP: ${resp.content}
Should Be Equal As Strings ${resp.status_code} 200
- Should Be Equal As JSON ${resp.content} ${expected_event_pnf_update_in_dpaap}
+ Should Be Equal As JSON ${resp.content} ${expected_event_pnf_update_in_dmaap}
Check created Logical Link
[Arguments] ${expected_logical_link_in_aai}
- ${resp}= Get Request ${aai_session} /verify/created_logical_link headers=${suite_headers}
+ ${resp}= Get Request ${aai_session} /verify/logical-link headers=${suite_headers}
Should Be Equal As Strings ${resp.status_code} 200
Should Be Equal As JSON ${resp.content} ${expected_logical_link_in_aai}
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index e5f0b102..43f4fab5 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -20,7 +20,6 @@ logger = logging.getLogger('AAI-simulator-logger')
AAI_RESOURCE_NOT_FOUND = b'{}'
pnf_entries = {}
-logical_links = {}
patched_pnf = AAI_RESOURCE_NOT_FOUND
created_logical_link = AAI_RESOURCE_NOT_FOUND
service_instance = AAI_RESOURCE_NOT_FOUND
@@ -32,15 +31,9 @@ class AAISetup(BaseHTTPRequestHandler):
if re.search('/setup/patched_pnf', self.path):
httpServerLib.set_response_200_ok(self, payload = patched_pnf)
logger.debug('AAISetup GET /setup/patched_pnf -> 200 OK')
- elif re.search('/verify/created_logical_link', self.path):
+ elif re.search('/verify/logical-link', self.path):
httpServerLib.set_response_200_ok(self, payload = created_logical_link)
- logger.debug('AAISetup GET /setup/created_logical_link -> 200 OK')
- elif re.search('/verify/logical-links', self.path):
- httpServerLib.set_response_200_ok(self, payload= json.dumps(logical_links).encode('utf-8'))
- elif re.search('/verify/logical-link/bbs-link', self.path):
- link_name = basename(self.path)
- if link_name in logical_links:
- httpServerLib.set_response_200_ok(self, payload = logical_links[link_name])
+ logger.debug('AAISetup GET /verify/logical_link -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAISetup GET ' + self.path + ' -> 404 Not found')
@@ -73,10 +66,9 @@ class AAISetup(BaseHTTPRequestHandler):
if logical_link_name == None:
raise Exception("Invalid logical link entry, could not extract `link-name`")
- global logical_link
- logical_links[logical_link_name] = logical_link_payload
+ global created_logical_link
+ created_logical_link = logical_link_payload
- logical_link = json.loads(logical_link_payload)
httpServerLib.set_response_200_ok(self)
logger.debug('AAISetup PUT /setup/add_logical_link -> 200 OK')
@@ -126,12 +118,12 @@ class AAIHandler(BaseHTTPRequestHandler):
logger.info('AAIHandler GET /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys()))
elif re.search('/aai/v12/network/logical-links/logical-link/[^/]*$', self.path):
logical_link_name = basename(self.path)
- if logical_link_name in logical_links:
- httpServerLib.set_response_200_ok(self, payload = logical_links[logical_link_name])
+ if json.loads(created_logical_link).get("link-name") == logical_link_name:
+ httpServerLib.set_response_200_ok(self, payload = created_logical_link)
logger.debug('AAIHandler GET /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
- logger.info('AAIHandler GET /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 404 Not found, actual entries: ' + str(logical_links.keys()))
+ logger.info('AAIHandler GET /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 404 Not found, actual link: ' + created_logical_link)
elif re.search('aai/v12/network/pnfs/pnf/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service', self.path):
httpServerLib.set_response_200_ok(self, payload = json.dumps(service_instance).encode('utf-8'))
logger.debug('AAIHandler GET aai/v12/network/pnfs/pnf/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK')
@@ -185,7 +177,10 @@ class AAIHandler(BaseHTTPRequestHandler):
httpServerLib.set_response_200_ok(self)
logical_link_name = re.search('.+?(?=\?)', basename(self.path)).group(0)
- del logical_links[logical_link_name]
+ global created_logical_link
+ if json.loads(created_logical_link).get("link-name") == logical_link_name:
+ created_logical_link = AAI_RESOURCE_NOT_FOUND
+
logger.debug('AAIHandler DELETE /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)