Issue-ID: DCAEGEN2-1531
Signed-off-by: Tomasz Wrobel <tomasz.wrobel@nokia.com>
Change-Id: I01c58ad1a7f5bfa9f05939843d0ffc8beb677c39
{
"related-to": "pnf",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
{
"related-to": "pnf",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v12/network/pnfs/pnf/NOK6061ZW9",
+ "related-link": "/aai/v23/network/pnfs/pnf/NOK6061ZW9",
"relationship-data": [
{
"relationship-key": "pnf.pnf-name",
"relationship-data": [
{
"relationship-key": "pnf.pnf-name",
-}
\ No newline at end of file
{
"related-to": "service-instance",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
{
"related-to": "service-instance",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v12/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service",
+ "related-link": "/aai/v23/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
{
"related-to": "logical-link",
"relationship-label": "org.onap.relationships.inventory.BridgedTo",
{
"related-to": "logical-link",
"relationship-label": "org.onap.relationships.inventory.BridgedTo",
- "related-link": "/aai/v12/network/logical-links/logical-link/bbs-link",
+ "related-link": "/aai/v23/network/logical-links/logical-link/bbs-link",
"relationship-data": [
{
"relationship-key": "logical-link.link-name",
"relationship-data": [
{
"relationship-key": "logical-link.link-name",
-}
\ No newline at end of file
{
"related-to": "pnf",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
{
"related-to": "pnf",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v12/network/pnfs/pnf/NOK6061ZW8",
+ "related-link": "/aai/v23/network/pnfs/pnf/NOK6061ZW8",
"relationship-data": [
{
"relationship-key": "pnf.pnf-name",
"relationship-data": [
{
"relationship-key": "pnf.pnf-name",
-}
\ No newline at end of file
{
"related-to": "service-instance",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
{
"related-to": "service-instance",
"relationship-label": "org.onap.relationships.inventory.ComposedOf",
- "related-link": "/aai/v12/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service",
+ "related-link": "/aai/v23/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
"relationship-data": [
{
"relationship-key": "customer.global-customer-id",
-}
\ No newline at end of file
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
- "aai.aaiClientConfiguration.pnfUrl": "https://aai:3334/aai/v12/network/pnfs/pnf",
- "aai.aaiClientConfiguration.baseUrl": "https://aai:3334/aai/v12",
+ "aai.aaiClientConfiguration.pnfUrl": "https://aai:3334/aai/v23/network/pnfs/pnf",
+ "aai.aaiClientConfiguration.baseUrl": "https://aai:3334/aai/v23",
"aai.aaiClientConfiguration.aaiUserName": "DCAE",
"aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
"aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
"aai.aaiClientConfiguration.aaiUserName": "DCAE",
"aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
"aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
- "aai.aaiClientConfiguration.aaiServiceInstancePath": "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
+ "aai.aaiClientConfiguration.aaiServiceInstancePath": "/business/customers/customer/{{customer}}/service-subscriptions/service-subscription/{{serviceType}}/service-instances/service-instance/{{serviceInstanceId}}",
"aai.aaiClientConfiguration.aaiHeaders": {
"X-FromAppId": "prh",
"X-TransactionId": "9999",
"aai.aaiClientConfiguration.aaiHeaders": {
"X-FromAppId": "prh",
"X-TransactionId": "9999",
-}
\ No newline at end of file
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserName": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapUserPassword": "admin",
"dmaap.dmaapUpdateProducerConfiguration.dmaapContentType": "application/json",
- "aai.aaiClientConfiguration.pnfUrl": "http://aai:3333/aai/v12/network/pnfs/pnf",
- "aai.aaiClientConfiguration.baseUrl": "https://aai:3334/aai/v12",
+ "aai.aaiClientConfiguration.pnfUrl": "http://aai:3333/aai/v23/network/pnfs/pnf",
+ "aai.aaiClientConfiguration.baseUrl": "https://aai:3334/aai/v23",
"aai.aaiClientConfiguration.aaiUserName": "DCAE",
"aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
"aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
"aai.aaiClientConfiguration.aaiUserName": "DCAE",
"aai.aaiClientConfiguration.aaiUserPassword": "DCAE",
"aai.aaiClientConfiguration.aaiIgnoreSslCertificateErrors": true,
- "aai.aaiClientConfiguration.aaiServiceInstancePath": "/business/customers/customer/${customer}/service-subscriptions/service-subscription/${serviceType}/service-instances/service-instance/${serviceInstanceId}",
+ "aai.aaiClientConfiguration.aaiServiceInstancePath": "/business/customers/customer/{{customer}}/service-subscriptions/service-subscription/{{serviceType}}/service-instances/service-instance/{{serviceInstanceId}}",
"aai.aaiClientConfiguration.aaiHeaders": {
"X-FromAppId": "prh",
"X-TransactionId": "9999",
"aai.aaiClientConfiguration.aaiHeaders": {
"X-FromAppId": "prh",
"X-TransactionId": "9999",
-}
\ No newline at end of file
${ves_event}= Get Data From File ${test_case_directory}/ves-event.json
Add PNF entry in AAI ${incorrect_aai_entry}
Set VES event in DMaaP ${ves_event}
${ves_event}= Get Data From File ${test_case_directory}/ves-event.json
Add PNF entry in AAI ${incorrect_aai_entry}
Set VES event in DMaaP ${ves_event}
- Wait for PRH log entry 20s Request failed for URL 'https://aai:3334/aai/v12/network/pnfs/pnf/NOK6061ZW8'. Response code: 404 Not Found
+ Wait for PRH log entry 20s Request failed for URL 'https://aai:3334/aai/v23/network/pnfs/pnf/NOK6061ZW8'. Response code: 404 Not Found
Verify AAI not responding is logged
[Arguments] ${test_case_directory}
Verify AAI not responding is logged
[Arguments] ${test_case_directory}
- if re.search('/aai/v12/network/pnfs/pnf/[^/]*$', self.path):
+ if re.search('/aai/v23/network/pnfs/pnf/[^/]*$', self.path):
pnf_name = basename(self.path)
if pnf_name in pnf_entries:
httpServerLib.set_response_200_ok(self, payload = pnf_entries[pnf_name])
pnf_name = basename(self.path)
if pnf_name in pnf_entries:
httpServerLib.set_response_200_ok(self, payload = pnf_entries[pnf_name])
- logger.debug('AAIHandler GET /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 200 OK')
+ logger.debug('AAIHandler GET /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
else:
httpServerLib.set_response_404_not_found(self)
- 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):
+ logger.info('AAIHandler GET /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys()))
+ elif re.search('/aai/v23/network/logical-links/logical-link/[^/]*$', self.path):
logical_link_name = basename(self.path)
if json.loads(created_logical_link).get("link-name") == logical_link_name:
httpServerLib.set_response_200_ok(self, payload = created_logical_link)
logical_link_name = basename(self.path)
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')
+ logger.debug('AAIHandler GET /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
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/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service', self.path):
+ logger.info('AAIHandler GET /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 404 Not found, actual link: ' + created_logical_link)
+ elif re.search('aai/v23/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'))
httpServerLib.set_response_200_ok(self, payload = json.dumps(service_instance).encode('utf-8'))
- logger.debug('AAIHandler GET aai/v12/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/service-instances/service-instance/bbs_service -> 200 OK')
+ logger.debug('AAIHandler GET aai/v23/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')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler GET ' + self.path + ' -> 404 Not found')
- if re.search('/aai/v12/network/pnfs/pnf/[^/]*$', self.path):
+ if re.search('/aai/v23/network/pnfs/pnf/[^/]*$', self.path):
pnf_name = basename(self.path)
if pnf_name in pnf_entries:
global patched_pnf
patched_pnf = httpServerLib.get_payload(self)
httpServerLib.set_response_200_ok(self)
pnf_name = basename(self.path)
if pnf_name in pnf_entries:
global patched_pnf
patched_pnf = httpServerLib.get_payload(self)
httpServerLib.set_response_200_ok(self)
- logger.debug('AAIHandler PATCH /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 200 OK')
+ logger.debug('AAIHandler PATCH /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
else:
httpServerLib.set_response_404_not_found(self)
- logger.info('AAIHandler PATCH /aai/v12/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys()))
+ logger.info('AAIHandler PATCH /aai/v23/network/pnfs/pnf/' + pnf_name + ' -> 404 Not found, actual entries: ' + str(pnf_entries.keys()))
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler PATCH ' + self.path + ' -> 404 Not found')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler PATCH ' + self.path + ' -> 404 Not found')
- if re.search('/aai/v12/network/logical-links/logical-link/[^/]*$', self.path):
+ if re.search('/aai/v23/network/logical-links/logical-link/[^/]*$', self.path):
global created_logical_link
created_logical_link = httpServerLib.get_payload(self)
httpServerLib.set_response_200_ok(self)
logical_link_name = basename(self.path)
global created_logical_link
created_logical_link = httpServerLib.get_payload(self)
httpServerLib.set_response_200_ok(self)
logical_link_name = basename(self.path)
- logger.debug('AAIHandler PUT /aai/v12/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
+ logger.debug('AAIHandler PUT /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler PUT ' + self.path + ' -> 404 Not found')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler PUT ' + self.path + ' -> 404 Not found')
def do_DELETE(self):
try:
def do_DELETE(self):
try:
- if re.search('/aai/v12/network/logical-links/logical-link/[^/]*\?resource-version=\d+$', self.path):
+ if re.search('/aai/v23/network/logical-links/logical-link/[^/]*\?resource-version=\d+$', self.path):
httpServerLib.set_response_200_ok(self)
logical_link_name = re.search('.+?(?=\?)', basename(self.path)).group(0)
httpServerLib.set_response_200_ok(self)
logical_link_name = re.search('.+?(?=\?)', basename(self.path)).group(0)
if json.loads(created_logical_link).get("link-name") == logical_link_name:
created_logical_link = AAI_RESOURCE_NOT_FOUND
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')
+ logger.debug('AAIHandler DELETE /aai/v23/network/logical-links/logical-link/' + logical_link_name + ' -> 200 OK')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler DELETE ' + self.path + ' -> 404 Not found')
else:
httpServerLib.set_response_404_not_found(self)
logger.info('AAIHandler DELETE ' + self.path + ' -> 404 Not found')
if __name__ == '__main__':
if __name__ == '__main__':
- _main_()
\ No newline at end of file