aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Rose <dr695h@att.com>2019-09-12 21:53:22 +0000
committerGerrit Code Review <gerrit@onap.org>2019-09-12 21:53:22 +0000
commitcb5be2a649e50ed9e7cd55867a76ca9de2d6630d (patch)
tree9e3b3b83d101afca51082100672dba61199fe09f
parentcab31efaa59bd5260f37385a4cc1a7bf51409467 (diff)
parentbbabae7720c0d4dda635a5fa1d3eba74be6b3ad9 (diff)
Merge "Correct path for service-instance"
-rw-r--r--tests/dcaegen2/prh-testcases/resources/prh_library.robot2
-rw-r--r--tests/dcaegen2/prh-testcases/resources/simulator/AAI.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/dcaegen2/prh-testcases/resources/prh_library.robot b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
index 80017349..1e6d3105 100644
--- a/tests/dcaegen2/prh-testcases/resources/prh_library.robot
+++ b/tests/dcaegen2/prh-testcases/resources/prh_library.robot
@@ -154,7 +154,7 @@ Add service instance entry in AAI
[Arguments] ${aai_service_instance}
${headers}= Create Dictionary Accept=application/json Content-Type=application/json
Log AAI url ${AAI_SIMULATOR_SETUP_URL}
- ${resp}= Put Request ${aai_session} /setup/add_service_instace headers=${suite_headers} data=${aai_service_instance}
+ ${resp}= Put Request ${aai_session} /setup/add_service_instance headers=${suite_headers} data=${aai_service_instance}
Should Be Equal As Strings ${resp.status_code} 200
Add logical link entry in AAI
diff --git a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
index 0886434e..eeb08265 100644
--- a/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
+++ b/tests/dcaegen2/prh-testcases/resources/simulator/AAI.py
@@ -54,12 +54,12 @@ class AAISetup(BaseHTTPRequestHandler):
httpServerLib.set_response_200_ok(self)
logger.debug('AAISetup PUT /setup/add_pnf_entry [' + pnf_name + '] -> 200 OK')
- elif re.search('/setup/add_service_instace', self.path):
+ elif re.search('/setup/add_service_instance', self.path):
service_instance_payload = httpServerLib.get_payload(self)
global service_instance
service_instance = json.loads(service_instance_payload)
httpServerLib.set_response_200_ok(self)
- logger.debug('AAISetup PUT /setup/add_service_instace -> 200 OK')
+ logger.debug('AAISetup PUT /setup/add_service_instance -> 200 OK')
elif re.search('/setup/add_logical_link', self.path):
logical_link_payload = httpServerLib.get_payload(self)
logical_link_name = json.loads(logical_link_payload).get("link-name")
@@ -124,9 +124,9 @@ class AAIHandler(BaseHTTPRequestHandler):
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 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):
+ elif re.search('aai/v12/network/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')
+ logger.debug('AAIHandler GET aai/v12/network/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler GET ' + self.path + ' -> 404 Not found')