diff options
Diffstat (limited to 'test')
15 files changed, 377 insertions, 33 deletions
diff --git a/test/csit/tests/dcaegen2/prh_testcases/__init__.robot b/test/csit/tests/dcaegen2/prh_testcases/__init__.robot new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/__init__.robot diff --git a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json new file mode 100644 index 000000000..d340709c9 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json @@ -0,0 +1,6 @@ +{"event": + {"correlationID":"NOKQTFCOC540002E", + "pnfOamIpv4Address":"10.16.123.234", + "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334" + } +} diff --git a/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json new file mode 100644 index 000000000..39c76df95 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/response.json @@ -0,0 +1,33 @@ +{"event": + {"commonEventHeader": + {"sourceId":"QTFCOC540002E", + "startEpochMicrosec":1519837825682, + "eventId":"QTFCOC540002E-reg", + "nfcNamingCode":"5DU", + "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, + "eventType":"pnfRegistration", + "priority":"Normal", + "version":3, + "reportingEntityName":"5GRAN_DU", + "sequence":0, + "domain":"other", + "lastEpochMicrosec":1519837825682, + "eventName":"pnfRegistration_5GDU", + "sourceName":"5GRAN_DU", + "nfNamingCode":"5GRAN" + }, + "otherFields": + {"pnfLastServiceDate":1517206400, + "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", + "pnfVendorName":"Nokia", + "pnfModelNumber":"AJ02", + "pnfFamily":"BBU", + "pnfType":"AirScale", + "otherFieldsVersion":1, + "pnfOamIpv4Address":"10.16.123.234", + "pnfSoftwareVersion":"v4.5.0.1", + "pnfSerialNumber":"QTFCOC540002E", + "pnfManufactureDate":1516406400 + } + } +} diff --git a/test/csit/tests/dcaegen2/prh_testcases/prh.robot b/test/csit/tests/dcaegen2/prh_testcases/prh.robot new file mode 100644 index 000000000..7c9b9533f --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/prh.robot @@ -0,0 +1,19 @@ +*** Settings *** +Documentation Testing PRH with various use scenarios +Suite Setup PRH Suite Setup +Suite Teardown PRH Suite Shutdown +Library Collections +Library resources/PrhLibrary.py +Resource resources/prh_keywords.robot + +*** Variables *** +${DMaaP_URL} http://localhost:3904 +${AAI_URL} http://localhost:3905 +${PNF_READY} %{WORKSPACE}/test/csit/tests/dcaegen2/prh_testcases/assets/json_events/pnf_ready.json + +*** Test Cases *** +New test + [Documentation] First positive TC + [Tags] PRH + #First TC will be added after initial commit + Should Be True True diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py new file mode 100644 index 000000000..893ed9460 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhLibrary.py @@ -0,0 +1,95 @@ +''' +Created on Apr 27, 2018 + +@author: mwagner9 +''' + +import threading +import time + +from robot.api import logger + +import PrhVariables +import Simulator + +st = '{"event":{"correlationID":"NOKQTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}' + +class PrhLibrary(object): + def __init__(self): + pass + + def setup_dmaap_server(self): + return _setup(PrhVariables.DMaaPHttpServerThread, 'DMaaP', PrhVariables.DMaaPIsRobotRun, Simulator, 3904) + + def setup_aai_server(self): + return _setup(PrhVariables.AAIHttpServerThread, 'AAI', PrhVariables.AAIIsRobotRun, Simulator, 3905) + + def shutdown_dmaap_server(self): + return _shutdown(PrhVariables.DMaaPHTTPD, 'DMaaP') + + def shutdown_aai_server(self): + return _shutdown(PrhVariables.AAIHTTPD, 'AAI') + + def is_json_empty(self, response): + logger.info("Enter is_json_empty: response.text: " + response.text) + if response.text is None or len(response.text) < 2: + return 'True' + return 'False' + + def dmaap_collectorTimeStamp_receive(self, search, response): + return _find_element(search, response) + + def AAI_Ipv4_receive(self, search, response): + return _find_element(search, response) + + def AAI_Ipv6_receive(self, search, response): + return _find_element(search, response) + + def check_pnf_ready(self): + if st in Simulator.prh_ready: + return 'true' + return 'false' + +def _setup(serverthread, servername, isrobotrun, module, portNum): + if serverthread is not None: + logger.console('{} Mockup Sever started'.format(servername)) + return "true" + + isrobotrun = True + + module_handler = module.AAIHandler if servername is 'AAI' else module.DMaaPHandler + + module.run_server(module_handler, portNum) + try: + serverthread = threading.Thread(name='{}_HTTPServer'.format(servername), target=module.Httpd.serve_forever) + serverthread.start() + logger.console('{} Mockup Sever started'.format(servername)) + time.sleep(2) + return "true" + except Exception as e: + print (str(e)) + return "false" + +def _shutdown(server, name): + if server is not None: + server.shutdown() + logger.console("{} Server shut down".format(name)) + time.sleep(3) + return "true" + else: + return "false" + +def _find_element(search, response): + while response is not None: + json_data = str(response) + if search in json_data: + return 'true' + return 'false' + +if __name__ == '__main__': + lib = PrhLibrary() + ret = lib.setup_dmaap_server() + print ret + ret = lib.setup_aai_server() + print ret + time.sleep(10) diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py new file mode 100644 index 000000000..882a4b9ce --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/PrhVariables.py @@ -0,0 +1,18 @@ +''' +Created on Apr 27, 2018 + +@author: mwagner9 +''' + +import os + +def GetEnvironmentVariable(envVarstr): + return os.environ.get(envVarstr) + +DMaaPHttpServerThread = None +DMaaPHTTPD = None +DMaaPIsRobotRun = False + +AAIHttpServerThread = None +AAIHTTPD = None +AAIIsRobotRun = False diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py b/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py new file mode 100644 index 000000000..e746d5a48 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/Simulator.py @@ -0,0 +1,91 @@ +''' +Created on May 10, 2018 + +@author: mwagner9 +''' + +import BaseHTTPServer +import re +import sys + +from robot.api import logger + +import PrhVariables + +Httpd = None +prh_ready = '' + +class BaseHandler(BaseHTTPServer.BaseHTTPRequestHandler, object): + def do_GET(self, param1, param2): + """Serve a GET request.""" + #prepare GET response + logger.console(self.raw_requestlinel) + json_string = param1 + if re.search(param2, self.path) is not None: + self.send_response(200) + self.send_header("Content-type", "application/json") + self.end_headers() + self.wfile.write(json_string) + +class AAIHandler(BaseHandler): + def do_PATCH(self): + #prepare PATCH response + logger.console('========') + logger.console(self.raw_requestline) + logger.console('========') + if re.search('/aai/v12/network/pnfs/pnf/NOKQTFCOC540002E', self.path)is not None: + st = '{"ipaddress-v6-oam": "2001:0db8:85a3:0000:0000:8a2e:0370:7334","ipaddress-v4-oam": "11.22.33.156"}' + logger.console('========') + logger.console(self.raw_requestline) + logger.console('========') + self.send_response(200) + + def do_GET(self): + param1 = '{"pnf-name":"NOKQTFCOC540002E", "pnf-id":"NOKQTFCOC540002E","ipaddress-v4-oam":"10.16.123.234","ipaddress-v6-oam":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}' + param2 = '/aai/v12/network/pnfs/pnf/NOKQTFCOC540002E' + super(self.__class__, self).do_GET(param1, param2) + +class DMaaPHandler(BaseHandler): + def do_GET(self): + param1 = '{"event": {"commonEventHeader": {"sourceId":"QTFCOC540002E", "startEpochMicrosec":1519837825682, "eventId":"QTFCOC540002E-reg", "nfcNamingCode":"5DU", "internalHeaderFields":{"collectorTimeStamp":"Fri, 04 27 2018 09:01:10 GMT"}, "eventType":"pnfRegistration", "priority":"Normal", "version":3, "reportingEntityName":"5GRAN_DU", "sequence":0, "domain":"other", "lastEpochMicrosec":1519837825682, "eventName":"pnfRegistration_5GDU", "sourceName":"5GRAN_DU", "nfNamingCode":"5GRAN"}, "otherFields": {"pnfLastServiceDate":1517206400, "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334", "pnfVendorName":"Nokia", "pnfModelNumber":"AJ02", "pnfFamily":"BBU", "pnfType":"AirScale", "otherFieldsVersion":1, "pnfOamIpv4Address":"10.16.123.234", "pnfSoftwareVersion":"v4.5.0.1", "pnfSerialNumber":"QTFCOC540002E", "pnfManufactureDate":1516406400}}}' + param2 = '/events/unauthenticated.SEC_OTHER_OUTPUT/OpenDCAE-c12/c12' + super(self.__class__, self).do_GET(param1, param2) + + def do_POST(self): + #Prepare POST response + logger.console('========') + logger.console(self.raw_requestline) + logger.console('========') + if re.search('/events/unauthenticated.PNF_READY', self.path) is not None: + global prh_ready + prh_ready = '{"event":{"correlationID":"NOKQTFCOC540002E", "pnfOamIpv4Address":"10.16.123.234", "pnfOamIpv6Address":"2001:0db8:85a3:0000:0000:8a2e:0370:7334"}}' + self.send_response(200) + +def run_server(HandlerClass, port, ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + global Httpd + Httpd = httpd + if HandlerClass is DMaaPHandler: + PrhVariables.DMaaPHTTPD = httpd + else: + PrhVariables.AAIHTTPD = httpd + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + +def _main_ (HandlerClass, port, ServerClass = BaseHTTPServer.HTTPServer, protocol="HTTP/1.0"): + server_address = ('', port) + + HandlerClass.protocol_version = protocol + httpd = ServerClass(server_address, HandlerClass) + + sa = httpd.socket.getsockname() + print "Serving HTTP on", sa[0], "port", sa[1], "..." + httpd.serve_forever() + +if __name__ == '__main__': + _main_(DMaaPHandler, 3904) diff --git a/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot b/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot new file mode 100644 index 000000000..1595cd4a4 --- /dev/null +++ b/test/csit/tests/dcaegen2/prh_testcases/resources/prh_keywords.robot @@ -0,0 +1,61 @@ +*** Settings *** +Documentation The main interface for interacting with PRH. It handles low level stuff like managing the http request library +Library PrhLibrary.py +Library RequestsLibrary + +*** Variables *** + +*** Keywords *** +PRH Suite Setup + [Documentation] Start DMaaP and AAI Mockup Server + ${ret}= Setup DMaaP Server + Should Be Equal As Strings ${ret} true + ${ret}= Setup AAI Server + Should Be Equal As Strings ${ret} true + +PRH Suite Shutdown + [Documentation] Shutdown DMaaP and AAI Mockup Server + ${ret}= Shutdown DMaap Server + Should Be Equal As Strings ${ret} true + ${ret}= Shutdown AAI Server + Should Be Equal As Strings ${ret} true + +Get event from DMaaP + [Arguments] ${ip} ${endpoint} + [Documentation] Get an event from DMaaP + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Get Request prh-d1 ${url} + Log Received response from dcae ${resp.json()} + [Return] ${resp} + +Send patch from AAI + [Arguments] ${ip} ${endpoint} + [Documentation] Get patch from AAI + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Patch Request prh-d1 ${url} + Log ${resp} + [Return] ${resp} + +Get json from AAI + [Arguments] ${ip} ${endpoint} + [Documentation] Get json from AAI + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Get Request prh-d1 ${url} + Log Received response from dcae ${resp.json()} + [Return] ${resp} + +Post json to DMaaP + [Arguments] ${ip} ${endpoint} ${PNF_READY} + [Documentation] Get json from AAI + ${url}= Catenate SEPARATOR= ${ip} ${endpoint} + Log Creating session ${url} + Create Session prh-d1 ${url} + ${resp}= Post Request prh-d1 ${url} data=${PNF_READY} + Log ${resp} + [Return] ${resp} diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env index fc59c48e8..c2ef4034a 100644 --- a/test/ete/labs/gwu/onap-openstack-template.env +++ b/test/ete/labs/gwu/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.xlarge # purposely use a smaller VM here to reduce RAM usage - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: http://192.168.1.11/horizon - keystone_url: http://192.168.1.11:5000 cloud_env: RegionOne diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env index cff445c93..900b08789 100644 --- a/test/ete/labs/huawei/onap-openstack-template.env +++ b/test/ete/labs/huawei/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.2xlarge - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: http://10.145.122.117/horizon - keystone_url: http://10.145.122.117:5000 cloud_env: RegionOne diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env index a75438f7a..b92221f43 100644 --- a/test/ete/labs/tlab/onap-openstack-template.env +++ b/test/ete/labs/tlab/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.xlarge - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: https://bdc1tlab01.research.att.com/horizon - keystone_url: https://bdc1tlab01.research.att.com:5000 cloud_env: openstack diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env index 1dbcbc4f6..f094f65a9 100644 --- a/test/ete/labs/windriver/onap-openstack-template.env +++ b/test/ete/labs/windriver/onap-openstack-template.env @@ -22,8 +22,6 @@ parameters: flavor_xlarge: m1.xlarge - flavor_xxlarge: m1.xxlarge - vm_base_name: onap key_name: onap_key @@ -54,8 +52,6 @@ parameters: openstack_region: RegionOne - horizon_url: http://10.12.25.2/horizon - keystone_url: http://10.12.25.2:5000 cloud_env: openstack diff --git a/test/mocks/pnfsimulator/simulator.sh b/test/mocks/pnfsimulator/simulator.sh index 27384dd04..5e8b2d5ac 100755 --- a/test/mocks/pnfsimulator/simulator.sh +++ b/test/mocks/pnfsimulator/simulator.sh @@ -4,7 +4,7 @@ set -euo pipefail CONTAINER_NAME=pnf-simulator CONFIG_FILE_PATH=/config/body.json -SIMULATOR_DOCKER_HUB=hub-name +SIMULATOR_DOCKER_HUB=nexus3.onap.org:10003/onap SIMULATOR_TAG=latest function main(){ diff --git a/test/vcpe/soutils.py b/test/vcpe/soutils.py index cc82068a6..623f12cc3 100755 --- a/test/vcpe/soutils.py +++ b/test/vcpe/soutils.py @@ -18,6 +18,7 @@ class SoUtils: :param vcpecommon: :param api_version: must be 'v4' or 'v5' """ + self.tmp_solution_for_so_bug = False self.logger = logging.getLogger(__name__) self.vcpecommon = vcpecommon if api_version not in self.vcpecommon.so_req_api_url: @@ -49,7 +50,9 @@ class SoUtils: self.logger.error('Invalid request type: {0}. Can only be service/vnf/network/vfmodule'.format(req_type)) return None, None + self.logger.info(url) r = requests.post(url, headers=self.vcpecommon.so_headers, auth=self.vcpecommon.so_userpass, json=req_json) + self.logger.debug(r) response = r.json() self.logger.debug('---------------------------------------------------------------') @@ -58,6 +61,7 @@ class SoUtils: self.logger.debug('---------------------------------------------------------------') req_id = response.get('requestReferences', {}).get('requestId', '') instance_id = response.get('requestReferences', {}).get('instanceId', '') + return req_id, instance_id def check_progress(self, req_id, eta=0, interval=5): @@ -119,7 +123,8 @@ class SoUtils: 'modelInfo': vnf_or_network_model, 'cloudConfiguration': {"lcpCloudRegionId": self.vcpecommon.os_region_name, "tenantId": self.vcpecommon.os_tenant_id}, - 'requestParameters': {"userParams": []} + 'requestParameters': {"userParams": []}, + 'platform': {"platformName": "Platform-Demonstration"} } self.add_req_info(req_details, instance_name, self.vcpecommon.product_family_id) self.add_related_instance(req_details, service_instance_id, service_model) @@ -149,14 +154,23 @@ class SoUtils: } } self.add_req_info(req_details, instance_name) + self.add_project_info(req_details) + self.add_owning_entity(req_details) return {'requestDetails': req_details} + def add_project_info(self, req_details): + req_details['project'] = {'projectName': self.vcpecommon.project_name} + + def add_owning_entity(self, req_details): + req_details['owningEntity'] = {'owningEntityId': self.vcpecommon.owning_entity_id, + 'owningEntityName': self.vcpecommon.owning_entity_name} + def generate_custom_service_request(self, instance_name, model, brg_mac): req_details = { 'modelInfo': model, 'subscriberInfo': {'subscriberName': 'Kaneohe', 'globalSubscriberId': self.vcpecommon.global_subscriber_id}, - 'cloudConfiguration': {"lcpCloudRegionId": self.vcpecommon.os_region_name, + 'cloudConfiguration': {"lcpCloudRegionId": 'CloudOwner_RegionOne', #self.vcpecommon.os_region_name, "tenantId": self.vcpecommon.os_tenant_id}, 'requestParameters': { "userParams": [ @@ -164,12 +178,23 @@ class SoUtils: 'name': 'BRG_WAN_MAC_Address', 'value': brg_mac } + , + { + "name": "Customer_Location", + "value": self.vcpecommon.customer_location_used_by_oof + }, + { + "name": "Homing_Solution", + "value": self.vcpecommon.homing_solution + } ], "subscriptionServiceType": "vCPE", 'aLaCarte': 'false' } } self.add_req_info(req_details, instance_name, self.vcpecommon.custom_product_family_id) + self.add_project_info(req_details) + self.add_owning_entity(req_details) return {'requestDetails': req_details} def create_custom_service(self, csar_file, brg_mac, name_suffix=None): @@ -186,7 +211,7 @@ class SoUtils: parser.svc_model['modelName'], name_suffix]) instance_name = instance_name.lower() req = self.generate_custom_service_request(instance_name, parser.svc_model, brg_mac) - self.logger.debug(json.dumps(req, indent=2, sort_keys=True)) + self.logger.info(json.dumps(req, indent=2, sort_keys=True)) self.logger.info('Creating custom service {0}.'.format(instance_name)) req_id, svc_instance_id = self.submit_create_req(req, 'service') if not self.check_progress(req_id, 140): diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index 5b3e009a3..cac5219ea 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -21,19 +21,19 @@ class VcpeCommon: # set the openstack cloud access credentials here cloud = { '--os-auth-url': 'http://10.12.25.2:5000', - '--os-username': 'YOUR ID', + '--os-username': 'kxi', '--os-user-domain-id': 'default', '--os-project-domain-id': 'default', - '--os-tenant-id': '087050388b204c73a3e418dd2c1fe30b', + '--os-tenant-id': '1e097c6713e74fd7ac8e4295e605ee1e', '--os-region-name': 'RegionOne', - '--os-password': 'YOUR PASSWD', - '--os-project-domain-name': 'Integration-SB-01', + '--os-password': 'n3JhGMGuDzD8', + '--os-project-domain-name': 'Integration-SB-07', '--os-identity-api-version': '3' } common_preload_config = { - 'oam_onap_net': 'oam_onap_c4Uw', - 'oam_onap_subnet': 'oam_onap_c4Uw', + 'oam_onap_net': 'oam_onap_lAky', + 'oam_onap_subnet': 'oam_onap_lAky', 'public_net': 'external', 'public_net_id': '971040b2-7059-49dc-b220-4fab50cb2ad4' } @@ -53,13 +53,17 @@ class VcpeCommon: 'mux_gw': ['10.5.0.10', '10.5.0.1'] } + dcae_ves_collector_name = 'dcae-bootstrap' global_subscriber_id = 'SDN-ETHERNET-INTERNET' + project_name = 'Project-Demonstration' + owning_entity_id = '520cc603-a3c4-4ec2-9ef4-ca70facd79c0' + owning_entity_name = 'OE-Demonstration' def __init__(self, extra_host_names=None): self.logger = logging.getLogger(__name__) self.logger.info('Initializing configuration') - self.host_names = ['so', 'sdnc', 'robot', 'aai-inst1', 'dcaedoks00'] + self.host_names = ['so', 'sdnc', 'robot', 'aai-inst1', self.dcae_ves_collector_name] if extra_host_names: self.host_names.extend(extra_host_names) # get IP addresses @@ -84,6 +88,13 @@ class VcpeCommon: self.common_preload_config['pub_key'] = self.pub_key self.sniro_url = 'http://' + self.hosts['robot'] + ':8080/__admin/mappings' self.sniro_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} + self.homing_solution = 'sniro' # value is either 'sniro' or 'oof' +# self.homing_solution = 'oof' + self.customer_location_used_by_oof = { + "customerLatitude": "32.897480", + "customerLongitude": "-97.040443", + "customerName": "some_company" + } ############################################################################################# # SDNC urls @@ -91,7 +102,7 @@ class VcpeCommon: self.sdnc_db_name = 'sdnctl' self.sdnc_db_user = 'sdnctl' self.sdnc_db_pass = 'gamma' - self.sdnc_db_port = '32768' + self.sdnc_db_port = '32774' self.sdnc_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} self.sdnc_preload_network_url = 'http://' + self.hosts['sdnc'] + \ ':8282/restconf/operations/VNF-API:preload-network-topology-operation' @@ -103,7 +114,7 @@ class VcpeCommon: # SO urls, note: do NOT add a '/' at the end of the url self.so_req_api_url = {'v4': 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/serviceInstances/v4', 'v5': 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/serviceInstances/v5'} - self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/orchestrationRequests/v2' + self.so_check_progress_api_url = 'http://' + self.hosts['so'] + ':8080/ecomp/mso/infra/orchestrationRequests/v5' self.so_userpass = 'InfraPortalClient', 'password1$' self.so_headers = {'Content-Type': 'application/json', 'Accept': 'application/json'} self.so_db_name = 'mso_catalog' @@ -257,7 +268,7 @@ class VcpeCommon: url = 'https://{0}:8443/aai/v11/search/nodes-query?search-node-type={1}&filter={2}:EQUALS:{3}'.format( self.hosts['aai-inst1'], search_node_type, key, node_uuid) - headers = {'Content-Type': 'application/json', 'Accept': 'application/json', 'X-FromAppID': 'vCPE-Robot'} + headers = {'Content-Type': 'application/json', 'Accept': 'application/json', 'X-FromAppID': 'vCPE-Robot', 'X-TransactionId': 'get_aai_subscr'} requests.packages.urllib3.disable_warnings() r = requests.get(url, headers=headers, auth=self.aai_userpass, verify=False) response = r.json() @@ -313,7 +324,8 @@ class VcpeCommon: if len(ip_dict) != len(keywords): self.logger.error('Cannot find all desired IP addresses for %s.', keywords) self.logger.error(json.dumps(ip_dict, indent=4, sort_keys=True)) - sys.exit() + self.logger.error('Temporarily continue.. remember to check back vcpecommon.py line: 316') +# sys.exit() return ip_dict def del_vgmux_ves_mode(self): @@ -329,8 +341,8 @@ class VcpeCommon: def set_vgmux_ves_collector(self ): url = self.vpp_ves_url.format(self.hosts['mux']) data = {'config': - {'server-addr': self.hosts['dcaedoks00'], - 'server-port': '8080', + {'server-addr': self.hosts[self.dcae_ves_collector_name], + 'server-port': '8081', 'read-interval': '10', 'is-add':'1' } |