diff options
| -rw-r--r-- | oti/event-handler/otihandler/cfy_client.py | 10 | ||||
| -rw-r--r-- | oti/event-handler/otihandler/config.py | 1 | ||||
| -rw-r--r-- | oti/event-handler/otihandler/consul_client.py | 20 | ||||
| -rw-r--r-- | oti/event-handler/otihandler/dti_processor.py | 162 | ||||
| -rw-r--r-- | oti/event-handler/otihandler/onap/CommonLogger.py | 2 | ||||
| -rw-r--r-- | oti/event-handler/otihandler/web_server.py | 42 | ||||
| -rw-r--r-- | oti/event-handler/pom.xml | 2 | ||||
| -rw-r--r-- | oti/event-handler/tests/__init__.py | 20 | ||||
| -rwxr-xr-x | oti/event-handler/tests/test_otihandler.py | 1894 | ||||
| -rw-r--r-- | oti/event-handler/tox-local.ini | 16 | ||||
| -rw-r--r-- | oti/event-handler/tox.ini | 12 | ||||
| -rw-r--r-- | releases/1.0.0-acumos-adapter-container.yaml | 8 | ||||
| -rw-r--r-- | releases/1.0.0-designtool-container.yaml | 8 | ||||
| -rw-r--r-- | releases/1.0.0-distributorapi-container.yaml | 8 | ||||
| -rw-r--r-- | releases/1.0.0-genprocessor-container.yaml | 10 | ||||
| -rw-r--r-- | releases/1.0.0-mod-nifi-registry-container.yaml | 8 | ||||
| -rw-r--r-- | releases/1.0.0-runtimeapi-container.yaml | 8 | ||||
| -rw-r--r-- | releases/1.3.1-blueprint-generator.yaml | 4 | ||||
| -rw-r--r-- | releases/2.12.0-onboardingapi-container.yaml | 8 |
19 files changed, 2125 insertions, 118 deletions
diff --git a/oti/event-handler/otihandler/cfy_client.py b/oti/event-handler/otihandler/cfy_client.py index c823340..4e3de87 100644 --- a/oti/event-handler/otihandler/cfy_client.py +++ b/oti/event-handler/otihandler/cfy_client.py @@ -168,7 +168,7 @@ class CfyClient(object): if not password: raise CfyClientConsulError("{} value is missing 'cloudify.password'".format(source)) - b64_encoded_str = base64.b64encode(bytes("{}:{}".format(username, password), 'utf-8')).decode("utf-8") + b64_encoded_str = base64.b64encode(bytes("{}:{}".format(username, password), "utf-8")).decode("utf-8") headers = {'Authorization': 'Basic ' + b64_encoded_str.rstrip('\n')} #headers = {'Authorization': 'Basic ' + '{}:{}'.format(username, password).encode("base64").rstrip('\n')} @@ -416,8 +416,8 @@ class CfyClient(object): continue # Check if the collector supports this VNF Type - # scn:dti Consul key is authoritative for vnfTypes that a collector supports (not docker_config) - dti_key = scn + ':dti' + # scn:oti Consul key is authoritative for vnfTypes that a collector supports (not docker_config) + dti_key = scn + ':oti' try: obj = ConsulClient.get_value(dti_key) except Exception as e: @@ -531,8 +531,8 @@ class CfyClient(object): continue # Check if the collector supports this VNF Type - # scn:dti Consul key is authoritative for vnfTypes that a collector supports (not docker_config) - dti_key = scn + ':dti' + # scn:oti Consul key is authoritative for vnfTypes that a collector supports (not docker_config) + dti_key = scn + ':oti' try: obj = ConsulClient.get_value(dti_key) except Exception as e: diff --git a/oti/event-handler/otihandler/config.py b/oti/event-handler/otihandler/config.py index d5149cc..5c87f43 100644 --- a/oti/event-handler/otihandler/config.py +++ b/oti/event-handler/otihandler/config.py @@ -24,6 +24,7 @@ import os from otihandler.consul_client import ConsulClient +os.makedirs('logs', exist_ok=True) logging.basicConfig( filename='logs/oti_handler.log', \ format='%(asctime)s.%(msecs)03d %(levelname)+8s ' + \ diff --git a/oti/event-handler/otihandler/consul_client.py b/oti/event-handler/otihandler/consul_client.py index d26d3a1..1b25f3e 100644 --- a/oti/event-handler/otihandler/consul_client.py +++ b/oti/event-handler/otihandler/consul_client.py @@ -410,7 +410,7 @@ class ConsulClient(object): # key = urllib.quote(key) # can't use urllib.quote() because it kills ':' in the key if value: - return {"KV": {"Verb": verb, "Key": key, "Value": base64.b64encode(value)}} + return {"KV": {"Verb": verb, "Key": key, "Value": base64.b64encode(bytes(value, "utf-8")).decode("utf-8")}} return {"KV": {"Verb": verb, "Key": key}} @@ -450,7 +450,7 @@ class ConsulClient(object): """put kvs into consul-kv""" if not kvs: - ConsulClient._logger.warn("kvs not supplied to store_kvs()") + ConsulClient._logger.warning("kvs not supplied to store_kvs()") return store_kvs = [ @@ -474,7 +474,7 @@ class ConsulClient(object): """delete key from consul-kv""" if not key: - ConsulClient._logger.warn("key not supplied to delete_key()") + ConsulClient._logger.warning("key not supplied to delete_key()") return delete_key = [ @@ -488,7 +488,7 @@ class ConsulClient(object): """delete key from consul-kv""" if not key: - ConsulClient._logger.warn("key not supplied to delete_kvs()") + ConsulClient._logger.warning("key not supplied to delete_kvs()") return delete_kvs = [ @@ -555,16 +555,16 @@ class ConsulClient(object): @staticmethod def add_vnf_id(scn, vnf_type, vnf_id, dti_dict): """ - Add VNF instance to Consul scn:dti key. + Add VNF instance to Consul scn:oti key. Treat its value as a JSON string representing a dict. Extend the dict by adding a dti_dict for vnf_id under vnf_type. Turn the resulting extended dict into a JSON string. - Store the string back into Consul under scn:dti key. + Store the string back into Consul under scn:oti key. Watch out for conflicting concurrent updates. """ - key = scn + ':dti' + key = scn + ':oti' lc_vnf_type = vnf_type.lower() while True: # do until update succeeds (mod_index, v) = ConsulClient.get_value(key, get_index=True) @@ -583,16 +583,16 @@ class ConsulClient(object): @staticmethod def delete_vnf_id(scn, vnf_type, vnf_id): """ - Delete VNF instance from Consul scn:dti key. + Delete VNF instance from Consul scn:oti key. Treat its value as a JSON string representing a dict. Modify the dict by deleting the vnf_id key entry from under vnf_type. Turn the resulting extended dict into a JSON string. - Store the string back into Consul under scn:dti key. + Store the string back into Consul under scn:oti key. Watch out for conflicting concurrent updates. """ - key = scn + ':dti' + key = scn + ':oti' lc_vnf_type = vnf_type.lower() while True: # do until update succeeds (mod_index, v) = ConsulClient.get_value(key, get_index=True) diff --git a/oti/event-handler/otihandler/dti_processor.py b/oti/event-handler/otihandler/dti_processor.py index 970e020..5802233 100644 --- a/oti/event-handler/otihandler/dti_processor.py +++ b/oti/event-handler/otihandler/dti_processor.py @@ -36,51 +36,51 @@ lock = Lock() K8S_CLUSTER_PROXY_NODE_PORT = '30132' -def notify_docker(args_tuple): - """ - event notification executor inside a process pool to communicate with docker container - interacts with docker client library - """ - (dti_event, db_access, ack_item) = args_tuple - try: - dcae_service_action = dti_event.get('dcae_service_action') - component_scn = ack_item.service_component - deployment_id = ack_item.deployment_id - container_id = ack_item.container_id - docker_host = ack_item.docker_host - reconfig_script = ack_item.reconfig_script - container_type = 'docker' - except Exception as e: - return ( - "ERROR", "dti_processor.notify_docker processing args got exception {}: {!s}".format(type(e).__name__, e)) - what = "" - try: - what = "{} in {} container {} on {} that was deployed by {}".format( - reconfig_script, container_type, container_id, docker_host, deployment_id) - if dcae_service_action == 'add': - add_action = {"dcae_service_action": "deploy"} - dti_event.update(add_action) - - if dcae_service_action == 'delete': - add_action = {"dcae_service_action": "undeploy"} - dti_event.update(add_action) - - # dkr = DockerClient(docker_host, reauth=False) - result = '' - # result = dkr.notify_for_reconfiguration(container_id, [ reconfig_script, "dti", json.dumps(dti_event) ]) - if dti_event.get('dcae_service_action') == 'undeploy': - # delete from dti_event_ack table - try: - db_access.deleteDomainObject(ack_item) - except Exception as e: - msg = "trying to delete event ack record, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) - return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) - else: - return (component_scn, "ran {}, got: {!s}".format(what, result)) - - except Exception as e: - return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) +# def notify_docker(args_tuple): +# """ +# event notification executor inside a process pool to communicate with docker container +# interacts with docker client library +# """ +# (dti_event, db_access, ack_item) = args_tuple +# try: +# dcae_service_action = dti_event.get('dcae_service_action') +# component_scn = ack_item.service_component +# deployment_id = ack_item.deployment_id +# container_id = ack_item.container_id +# docker_host = ack_item.docker_host +# reconfig_script = ack_item.reconfig_script +# container_type = 'docker' +# except Exception as e: +# return ( +# "ERROR", "dti_processor.notify_docker() processing args got exception {}: {!s}".format(type(e).__name__, e)) +# what = "" +# try: +# what = "{} in {} container {} on {} that was deployed by {}".format( +# reconfig_script, container_type, container_id, docker_host, deployment_id) +# if dcae_service_action == 'add': +# add_action = {"dcae_service_action": "deploy"} +# dti_event.update(add_action) +# +# if dcae_service_action == 'delete': +# add_action = {"dcae_service_action": "undeploy"} +# dti_event.update(add_action) +# +# # dkr = DockerClient(docker_host, reauth=False) +# result = '' +# # result = dkr.notify_for_reconfiguration(container_id, [ reconfig_script, "dti", json.dumps(dti_event) ]) +# if dti_event.get('dcae_service_action') == 'undeploy': +# # delete from dti_event_ack table +# try: +# db_access.deleteDomainObject(ack_item) +# except Exception as e: +# msg = "trying to delete event ack record, got exception {}: {!s}".format(type(e).__name__, e) +# DTIProcessor.logger.warning(msg) +# return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) +# else: +# return (component_scn, "ran {}, got: {!s}".format(what, result)) +# +# except Exception as e: +# return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) def notify_svc(args_tuple): @@ -103,7 +103,7 @@ def notify_svc(args_tuple): reconfig_script = res_tuple[7] container_type = res_tuple[8] except Exception as e: - return ("ERROR", "oti_processor.notify processing args got exception {}: {!s}".format(type(e).__name__, e)) + return ("ERROR", "dti_processor.notify_svc() processing args got exception {}: {!s}".format(type(e).__name__, e)) what = "" if container_type == "docker": @@ -136,7 +136,7 @@ def notify_svc(args_tuple): db_access.saveDomainObject(upd_evt_ack) except Exception as e: msg = "trying to update event ack record, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) else: DTIProcessor.logger.debug("running {}".format(what)) @@ -152,39 +152,39 @@ def notify_svc(args_tuple): db_access.saveDomainObject(add_evt_ack) except Exception as e: msg = "trying to store event ack record, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) else: # remove from dtih_event_ack if present - if curr_evt is not None: + if curr_evt: try: del_evt_ack = db_access.query_event_info_docker(curr_evt, component_scn, deployment_id, container_id) db_access.deleteDomainObject(del_evt_ack) except Exception as e: msg = "trying to delete event ack record for docker service, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) except Exception as e: return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) return (component_scn, "ran {}, got: {!s}".format(what, result)) elif container_type == "k8s": - DTIProcessor.logger.debug("DTIProcessor.notify_svc() handling k8s component") + DTIProcessor.logger.debug("dti_processor.notify_svc() handling k8s component") # if action is 'update', check if k8s pod info exists already for this event in app db if dcae_service_action == 'add': - DTIProcessor.logger.debug("DTIProcessor.notify_svc() in k8s for add action") + DTIProcessor.logger.debug("dti_processor.notify_svc() in k8s for add action") return notify_k8s((dti_event, db_access, curr_evt, res_tuple)) elif dcae_service_action == 'update': # handle update for pods being tracked and handle add for new pods k8s_scn_result = db_access.query_event_data_k8s_pod(curr_evt, component_scn) - if k8s_scn_result is not None: + if k8s_scn_result: # update - DTIProcessor.logger.debug("DTIProcessor.notify_svc() in k8s for update action") + DTIProcessor.logger.debug("dti_processor.notify_svc() in k8s for update action") return notify_k8s_pod((dti_event, db_access, k8s_scn_result)) else: # add - DTIProcessor.logger.debug("DTIProcessor.notify_svc(), convert update to add action in k8s ") + DTIProcessor.logger.debug("dti_processor.notify_svc(), convert update to add action in k8s ") add_action = {"dcae_service_action": "add"} dti_event.update(add_action) return notify_k8s((dti_event, db_access, curr_evt, res_tuple)) @@ -248,7 +248,7 @@ def notify_k8s(args_tuple): return (component_scn, "ran {}, got: {!s}".format(what, event_ack_info)) except Exception as e: msg = "trying to store event ack record, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) @@ -304,7 +304,7 @@ def notify_pods(args_tuple): notify_response_arr.append((pod_id, "ran {}, got: {!s}".format(what, event_ack_info))) except Exception as e: with lock: - notify_response_arr.append (("ERROR", "dti_processor.notify() processing args got exception {}: {!s}".format(type(e).__name__, e))) + notify_response_arr.append (("ERROR", "dti_processor.notify_pods() processing args got exception {}: {!s}".format(type(e).__name__, e))) def notify_k8s_pod(args_tuple): """ @@ -339,7 +339,7 @@ def notify_k8s_pod(args_tuple): db_access.deleteDomainObject(ack_item) except Exception as e: msg = "trying to delete event ack record, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) else: try: @@ -347,7 +347,7 @@ def notify_k8s_pod(args_tuple): db_access.saveDomainObject(ack_item) except Exception as e: msg = "trying to update event ack record, got exception {}: {!s}".format(type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) return (component_scn, "exception {}: {!s} running {}".format(type(e).__name__, e, what)) return (component_scn, "ran {}, got: {!s}".format(what, response.json())) @@ -448,12 +448,12 @@ class DTIProcessor(object): result = ConsulClient.delete_key(key) except Exception as e: msg = "trying to delete Consul history key {}, got exception {}: {!s}".format(key, type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['WARNING'] = msg else: if not result: msg = "VNF instance {} was not in Consul dti_events historical folder".format(self.target_name) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['WARNING'] = msg def deploy(self): @@ -467,7 +467,7 @@ class DTIProcessor(object): result = ConsulClient.store_kvs({dep_key: self.event}) except Exception as e: msg = "trying to store Consul history key {}, got exception {}: {!s}".format(key, type(e).__name__, e) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['WARNING'] = msg def add(self): @@ -484,7 +484,7 @@ class DTIProcessor(object): self.db_access.saveDomainObject(self.prim_db_event) except Exception as e: msg = "trying to store event, got exception {}: {!s}".format(type(e).__name__, e.args) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['ERROR'] = msg raise Exception(msg) else: @@ -546,7 +546,7 @@ class DTIProcessor(object): dcae_service_location=self.event_clli)) )) except Exception as e: - msg = "DTIProcessor._add() running pool.map() got exception {}: {!s}".format(type(e).__name__, e) + msg = "DTIProcessor.add_replay() running pool.map() got exception {}: {!s}".format(type(e).__name__, e) DTIProcessor.logger.error(msg) self._result['ERROR'] = msg return res_dict @@ -564,7 +564,7 @@ class DTIProcessor(object): try: msg = "processing delete event for {}/{} to relate with any docker hosts".format( self.target_type, self.target_name) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) res_dict_docker = dict(self.docker_pool.map(notify_svc, ((self.event, self.db_access, self.prim_db_event, tp) for tp @@ -581,8 +581,8 @@ class DTIProcessor(object): try: msg = "processing delete event for {}/{} to relate with any k8s hosts".format( self.target_type, self.target_name) - DTIProcessor.logger.warn(msg) - if self.prim_db_event is not None: + DTIProcessor.logger.warning(msg) + if self.prim_db_event: result = self.db_access.query_event_data_k8s(self.target_type, self.target_name) res_dict_k8s = dict(self.k8s_pool.map(notify_k8s_pod, ( ((self.event, self.db_access, ack_item) for ack_item in result)))) @@ -592,21 +592,21 @@ class DTIProcessor(object): self._result['ERROR'] = msg try: - if self.prim_db_event is not None: + if self.prim_db_event: self.db_access.deleteDomainObject(self.prim_db_event) except Exception as e: msg = "trying to delete event from database, got exception {}: {!s}".format(type(e).__name__, e.args) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['ERROR'] = msg except Exception as e: msg = "trying to process delete event, got exception {}: {!s}".format(type(e).__name__, e.args) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['ERROR'] = msg - if res_dict_k8s is not None: + if res_dict_k8s: utils.update_dict(res_dict, res_dict_k8s) - if res_dict_docker is not None: + if res_dict_docker: utils.update_dict(res_dict, res_dict_docker) return res_dict @@ -622,14 +622,14 @@ class DTIProcessor(object): if self.is_notify: try: self.prim_db_event = self.db_access.query_event_item(self.target_type, self.target_name) - if self.prim_db_event is not None: + if self.prim_db_event: self.db_access.update_event_item(self.event, self.target_type, self.target_name) result = self.db_access.query_event_data(self.target_type, self.target_name) if len(result) == 0: msg = "processing update event for {}/{}, but event distribution info is not found in database, " \ "replaying this event to cluster if required". \ format(self.target_type, self.target_name) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['WARNING'] = msg res_dict = self.add_replay() else: @@ -654,7 +654,7 @@ class DTIProcessor(object): # event is new for the handler msg = "processing update event for {}/{}, but current event info is not found in database, " \ "executing add event".format(self.target_type, self.target_name) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['WARNING'] = msg res_dict = self.add() except Exception as e: @@ -662,10 +662,10 @@ class DTIProcessor(object): DTIProcessor.logger.error(msg) self._result['ERROR'] = msg - if res_dict_k8s is not None: + if res_dict_k8s: utils.update_dict(res_dict, res_dict_k8s) - if res_dict_docker is not None: + if res_dict_docker: utils.update_dict(res_dict, res_dict_docker) return res_dict @@ -678,7 +678,7 @@ class DTIProcessor(object): res_dict = {} try: self.prim_db_event = self.db_access.query_event_item(self.target_type, self.target_name) - if self.prim_db_event is not None: + if self.prim_db_event: self.db_access.update_event_item(self.event, self.target_type, self.target_name) else: self.prim_db_event = Event(event=self.event, target_name=self.target_name, target_type=self.target_type, @@ -686,7 +686,7 @@ class DTIProcessor(object): self.db_access.saveDomainObject(self.prim_db_event) except Exception as e: msg = "trying to store notify event, got exception {}: {!s}".format(type(e).__name__, e.args) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['ERROR'] = msg try: @@ -696,7 +696,7 @@ class DTIProcessor(object): res_dict[k] = v except Exception as e: msg = "trying to run notify event, got exception {}: {!s}".format(type(e).__name__, e.args) - DTIProcessor.logger.warn(msg) + DTIProcessor.logger.warning(msg) self._result['WARNING'] = msg return res_dict @@ -785,7 +785,7 @@ class DTIProcessor(object): pass try: - supported_types = ConsulClient.get_value(service_name + ":dti") + supported_types = ConsulClient.get_value(service_name + ":oti") except: return r_dict else: diff --git a/oti/event-handler/otihandler/onap/CommonLogger.py b/oti/event-handler/otihandler/onap/CommonLogger.py index 644534d..3b5b477 100644 --- a/oti/event-handler/otihandler/onap/CommonLogger.py +++ b/oti/event-handler/otihandler/onap/CommonLogger.py @@ -781,7 +781,7 @@ class CommonLogger: print("error creating %s directory to hold %s logfile: %s" %(folder, filename, str(err))) sys.exit(2) -if __name__ == "__main__": +if __name__ == "__main__": # pragma: no cover def __checkOneTime(line): format = r'[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2},[0-9]{3}[+]00:00[|]' diff --git a/oti/event-handler/otihandler/web_server.py b/oti/event-handler/otihandler/web_server.py index f3eb071..45c407f 100644 --- a/oti/event-handler/otihandler/web_server.py +++ b/oti/event-handler/otihandler/web_server.py @@ -180,6 +180,8 @@ class _DTIWeb(object): if cherrypy.request.method != "POST": raise cherrypy.HTTPError(404, "unexpected method {}".format(cherrypy.request.method)) + msg = "" + dti_event = cherrypy.request.json or {} str_dti_event = json.dumps(dti_event) @@ -192,38 +194,38 @@ class _DTIWeb(object): dcae_service_action = dti_event.get('dcae_service_action') if not dcae_service_action: msg = 'dcae_service_action is missing' - DTIWeb.logger.error(msg) - raise cherrypy.HTTPError(400, msg) elif dcae_service_action.lower() not in self.VALID_EVENT_TYPES: msg = 'dcae_service_action is invalid' - DTIWeb.logger.error(msg) - raise cherrypy.HTTPError(400,msg) dcae_target_name = dti_event.get('dcae_target_name') - if not dcae_target_name: + if not msg and not dcae_target_name: msg = 'dcae_target_name is missing' - DTIWeb.logger.error(msg) - raise cherrypy.HTTPError(400, msg) dcae_target_type = dti_event.get('dcae_target_type', '') - if not dcae_target_type: + if not msg and not dcae_target_type: msg = 'dcae_target_type is missing' - DTIWeb.logger.error(msg) - raise cherrypy.HTTPError(400, msg) - send_notification = True - if (isinstance(notify, bool) and not notify) or \ - (isinstance(notify, str) and notify.lower() in [ "f", "false", "n", "no" ]): - send_notification = False + if msg: + result = {"ERROR": msg} + + DTIWeb.logger.error("%s: dti_event=%s result=%s", \ + req_info, str_dti_event, json.dumps(result)) + else: + send_notification = True + if (isinstance(notify, bool) and not notify) or \ + (isinstance(notify, str) and notify.lower() in [ "f", "false", "n", "no" ]): + send_notification = False - prc = DTIProcessor(dti_event, send_notification=send_notification) - result = prc.get_result() + prc = DTIProcessor(dti_event, send_notification=send_notification) + result = prc.get_result() - DTIWeb.logger.info("%s: dti_event=%s result=%s", \ - req_info, str_dti_event, json.dumps(result)) + DTIWeb.logger.info("%s: dti_event=%s result=%s", \ + req_info, str_dti_event, json.dumps(result)) success, http_status_code, _ = audit.audit_done(result=json.dumps(result)) - if not success: + if msg: + cherrypy.response.status = "400 Bad Request" + elif not success: cherrypy.response.status = http_status_code return result @@ -537,7 +539,7 @@ class _DTIWeb(object): req_info, service_name, json.dumps(cherrypy.request.headers)) try: - result = CBSRest.get_dti(service_name=service_name, vnf_type=vnf_type, vnf_id=vnf_id, service_location=service_location) + result = CBSRest.get_oti(service_name=service_name, vnf_type=vnf_type, vnf_id=vnf_id, service_location=service_location) except Exception as e: result = {"ERROR": "exception {}: {!s}".format(type(e).__name__, e)} audit.set_http_status_code(404) diff --git a/oti/event-handler/pom.xml b/oti/event-handler/pom.xml index 962d742..06f6f21 100644 --- a/oti/event-handler/pom.xml +++ b/oti/event-handler/pom.xml @@ -28,7 +28,7 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <sonar.sources>.</sonar.sources> <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath> - <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath> + <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths> <sonar.language>py</sonar.language> <sonar.pluginname>python</sonar.pluginname> <sonar.inclusions>**/*.py</sonar.inclusions> diff --git a/oti/event-handler/tests/__init__.py b/oti/event-handler/tests/__init__.py new file mode 100644 index 0000000..bfa3da1 --- /dev/null +++ b/oti/event-handler/tests/__init__.py @@ -0,0 +1,20 @@ +# ================================================================================ +# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +# + + +# empty __init__.py so that pytest can add correct path to coverage report, -- per pytest +# best practice guideline diff --git a/oti/event-handler/tests/test_otihandler.py b/oti/event-handler/tests/test_otihandler.py new file mode 100755 index 0000000..6f99638 --- /dev/null +++ b/oti/event-handler/tests/test_otihandler.py @@ -0,0 +1,1894 @@ +# ============LICENSE_START======================================================= +# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +# + +"""test otihandler package of DCAE-Controller""" + +import base64 +import copy +import json +import logging +import os +import re +import sys +import time +import uuid +# from urlparse import urlparse, parse_qsl +from datetime import datetime + +import pytest +import cherrypy +from cherrypy.test import helper + +from otihandler.config import Config +from otihandler.consul_client import (ConsulClient, + ConsulClientConnectionError, ConsulClientServiceNotFoundError, + ConsulClientKVEntryNotFoundError) +from otihandler.onap.audit import (Audit, AuditHttpCode) +from otihandler.__main__ import LogWriter +from otihandler.web_server import _DTIWeb + +OTIHANDLER_VERSION = "1.0.0" + +false = False +true = True +null = None + +class Settings(object): + """init all locals""" + + logger = None + RUN_TS = datetime.utcnow().isoformat()[:-3] + 'Z' + discovered_config = None + + @staticmethod + def init(): + """init locals""" + + os.environ["CLOUDIFY"] = '{"cloudify":{"protocol":"https","user":"XXXXX","password":"XXXX","address":"cloudify.bogus.com","port":"443"}}' + os.environ["CONSUL_URL"] = "http://consul:8500" + os.environ["OTI_HANDLER_URL"] = "https://oti_handler:8443" + + Config.load_from_file() + + with open("etc/config.json", 'r') as config_json: + Settings.discovered_config = json.load(config_json) + + Config.load_from_file("etc/config.json") + + Settings.logger = logging.getLogger("otihandler.unit_test") + sys.stdout = LogWriter(Settings.logger.info) + sys.stderr = LogWriter(Settings.logger.error) + + print("print ========== run_otihandler ==========") + Settings.logger.info("========== run_otihandler ==========") + Audit.init(Config.get_system_name(), OTIHANDLER_VERSION, Config.LOGGER_CONFIG_FILE_PATH) + + Settings.logger.info("starting otihandler with config:") + Settings.logger.info(Audit.log_json_dumps(Config.config)) + +Settings.init() + + +class MonkeyHttpResponse(object): + """Monkey http response""" + + def __init__(self, headers): + """init locals""" + + self.headers = headers or {} + +class MonkeyRequestsResponse(object): + """Monkey response""" + + def __init__(self, full_path, res_json, json_body=None, headers=None, status_code=200): + """init locals""" + + self.full_path = full_path + self.req_json = json_body or {} + self.status_code = status_code + self.request = MonkeyHttpResponse(headers) + self.res = res_json + self.text = json.dumps(self.res) + + def json(self): + """returns json of response""" + + return self.res + + def raise_for_status(self): + """ignoring""" + + if self.status_code == 200: + return + else: + Settings.logger.warning("raise_for_status found status_code: {}".format(self.status_code)) + +def kv_encode(key, value): + """helper function to encode a consul key value""" + + rtn = { + "LockIndex": 0, + "Key": key, + "Flags": 0, + "Value": base64.b64encode(bytes(value, "utf-8")).decode("utf-8"), + "CreateIndex": 19, + "ModifyIndex": 99999 + } + return rtn + +def monkey_consul_client_get(full_path, **kwargs): + """monkeypatch for GET from consul""" + + rv = None + res_json = {} + if full_path == ConsulClient.CONSUL_SERVICE_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "cloudify_manager"): + res_json = [{ + "ID": "048ec7c9-aa2e-bfad-34c7-6755e0007c9c", + "Node": "zldcdyh1adcc1orcl00.novalocal", + "Address": "192.168.1.13", + "Datacenter": "zldcdyh1adcc1", + "TaggedAddresses": { + "lan": "192.168.1.13", + "wan": "192.168.1.13" + }, + "NodeMeta": {}, + "ServiceID": "cloudify_manager", + "ServiceName": "cloudify_manager", + "ServiceTags": [], + "ServiceAddress": "1.1.1.1", + "ServicePort": 80, + "ServiceEnableTagOverride": false, + "CreateIndex": 1569262, + "ModifyIndex": 1569262 + }] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_SERVICE_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_handler"): + res_json = [{ + "ID": "476991b8-7f40-e3c2-9d5e-f936c2aeaf56", + "Node": "zldcdyh1adcc1dokr00", + "Address": "32.68.15.149", + "Datacenter": "zldcdyh1adcc1", + "TaggedAddresses": { + "lan": "32.68.15.149", + "wan": "32.68.15.149" + }, + "NodeMeta": { + "fqdn": "oti_handler" + }, + "ServiceID": "58a417002f89:oti_handler:8443", + "ServiceName": "oti_handler", + "ServiceTags": [ + "oti_handler", + "oti_handler" + ], + "ServiceAddress": "1.1.1.2", + "ServicePort": 8443, + "ServiceEnableTagOverride": false, + "CreateIndex": 1161355, + "ModifyIndex": 1161355 + }] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_SERVICE_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "deployment_handler"): + res_json = [{ + "ID": "476991b8-7f40-e3c2-9d5e-f936c2aeaf56", + "Node": "zldcdyh1adcc1dokr00", + "Address": "32.68.15.149", + "Datacenter": "zldcdyh1adcc1", + "TaggedAddresses": { + "lan": "32.68.15.149", + "wan": "32.68.15.149" + }, + "NodeMeta": { + "fqdn": "deployment_handler:8188" + }, + "ServiceID": "58a417002f89:deployment_handler:8188", + "ServiceName": "deployment_handler", + "ServiceTags": [ + "deployment_handler", + "deployment_handler" + ], + "ServiceAddress": "1.1.1.2", + "ServicePort": 8188, + "ServiceEnableTagOverride": false, + "CreateIndex": 1502800, + "ModifyIndex": 1502800 + }] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_SERVICE_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "zldcdyh1adcc1-component-dockerhost-1"): + res_json = [{ + "ID": "4ffed53d-7601-7d47-df93-c091ea66fb45", + "Node": "zldcdyh1adcc1dokr02", + "Address": "32.68.15.163", + "Datacenter": "zldcdyh1adcc1", + "TaggedAddresses": { + "lan": "32.68.15.163", + "wan": "32.68.15.163" + }, + "NodeMeta": { + "fqdn": "zldcdyh1adcc1dokr02.bogus.com" + }, + "ServiceID": "zldcdyh1adcc1-component-dockerhost-1", + "ServiceName": "zldcdyh1adcc1-component-dockerhost-1", + "ServiceTags": [ + "LSLEILAA", + "MDTWNJC1" + ], + "ServiceAddress": "1.1.1.5", + "ServicePort": 2376, + "ServiceEnableTagOverride": false, + "CreateIndex": 1704211, + "ModifyIndex": 1704211 + }] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), Config.get_system_name()): + res_json = copy.deepcopy(Settings.discovered_config) + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "cloudify_manager"): + res_json = [kv_encode("cloudify_manager", json.dumps( + {"cloudify":{"protocol" : "http", "user": "admin", "password":"XXXX"}} + ))] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_2:oti"): + res_json = [ + kv_encode("SCN_2:oti", json.dumps( + { + "anot-her": { + "another01ems003": {"dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_target_name": "another01ems003", "dcae_target_collection": "true", "event": {}, "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_prov-status": "PROV"} + } + } + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "docker_plugin/docker_logins"): + res_json = [ + kv_encode("docker_plugin/docker_logins", json.dumps( + [{"username": "fake_user", "password": "fake_password", + "registry": "registry.bogus.com:5100" }] + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/") \ + or full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/anot-her/"): + res_json = [ + kv_encode("oti_events/anot-her/another01ems003", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "ANOT-her", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "another01ems003", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )), + kv_encode("oti_events/anot-her/another01ems042", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "ANOT-her", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.42", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "another01ems042", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )), + kv_encode("oti_events/anot-her/another01ems044", json.dumps( + {"dcae_service_location": "MDTWNJC1", + "dcae_target_type": "ANOT-her", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.42", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "another01ems044", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/birth-day/"): + res_json = [ + kv_encode("oti_events/birth-day/birthdy01ems055", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "birth-day", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "birthdy01ems055", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"birthdy01ems055_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "birthdy01ems055"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + res_json = [ + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/new-type/"): + res_json = [ + kv_encode("oti_events/new-type/newtype01ems084", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "new-type", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "newtype01ems084", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"newtype01ems084_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "newtype01ems084"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + res_json = [ + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/pcrf-oam/"): + res_json = [ + kv_encode("oti_events/pcrf-oam/pcrfoam01ems009", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "pcrf-oam", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "pcrfoam01ems009", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"pcrfoam01ems009_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "pcrfoam01ems009"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + res_json = [ + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/pnga-xxx/"): + res_json = [ + kv_encode("oti_events/pnga-xxx/pngaxxx01ems007", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "pnga-xxx", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "pngaxxx01ems007", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"pngaxxx01ems007_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "pngaxxx01ems007"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + res_json = [ + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/vhss-ems/"): + res_json = [ + kv_encode("oti_events/vhss-ems/vhssems01ems019", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "vhss-ems", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "vhssems01ems019", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"vhssems01ems019_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "vhssems01ems019"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + res_json = [ + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/anot-her/another01ems003"): + res_json = [ + kv_encode("oti_events/anot-her/another01ems003", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "ANOT-her", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.3", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "another01ems003", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/anot-her/another01ems042"): + res_json = [ + kv_encode("oti_events/anot-her/another01ems042", json.dumps( + {"dcae_service_location": "LSLEILAA", + "dcae_target_type": "ANOT-her", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.42", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "another01ems042", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "oti_events/anot-her/another01ems044"): + res_json = [ + kv_encode("oti_events/anot-her/another01ems044", json.dumps( + {"dcae_service_location": "MDTWNJC1", + "dcae_target_type": "ANOT-her", + "dcae_service_action": "deploy", + "dcae_service-instance_model-version-id": "1", + "dcae_target_collection_ip": "107.239.85.42", + "dcae_target_is-closed-loop-disabled": "false", + "dcae_target_in-maint": "false", + "dcae_target_name": "another01ems044", + "dcae_target_collection": "true", + "event": {}, + "dcae_snmp_version": "2c", + "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"serviceType": "MOB-VHSS", "nodeType": "VHSS", "description": "VHSS Data Collection", "priority": 1, "nodeSubtype": "", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroupId": "g1", "serverGroup": [{"isPrimary": "true", "remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044"}]}}, "protocol": "sftp", "collectionInterval": "300"}}}, + "dcae_snmp_community_string": "my_first_community", + "dcae_generic-vnf_model-version-id": "1", + "dcae_target_prov-status": "PROV" + } + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1"): + res_json = [ + kv_encode("SCN_1", json.dumps( + {"dcae_target_type": ["pnga-xxx"]} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:oti"): + res_json = [ + kv_encode("SCN_1:oti", json.dumps( + {"new-type": {}, "pnga-xxx": {}, "birth-day": {}, "anot-her": {}, "vhss-ems": {}, "pcrf-oam": {}} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:dmaap"): + res_json = [ + kv_encode("SCN_1:dmaap", json.dumps( + {"topic0": { + "topic_url": "https://dcae-mrtr.bogus.com:3005/events/com.bogus.HelloWorld-PubTopic", + "client_role": "com.bogus.member", + "location": "loc-1", + "client_id": "1575649224792" + }, + "topic1": { + "topic_url": "https://dcae-mrtr.bogus.com:3005/events/com.bogus.HelloWorld-PubTopic", + "client_role": "com.bogus.member", + "location": "loc-1", + "client_id": "1575649221094" + } + } + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:rel"): + res_json = [ + kv_encode("SCN_1:rel", json.dumps( + {"who-knows", "what this content might look like?"} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1"): + res_json = [ + kv_encode("SCN_1", json.dumps( + {"dcae_target_type": ["pnga-xxx"]} + )), + kv_encode("SCN_1:oti", json.dumps( + {"new-type": {}, "pnga-xxx": {}, "birth-day": {}, "anot-her": {}, "vhss-ems": {}, "pcrf-oam": {}} + )), + kv_encode("SCN_1:policies/event", json.dumps( + {"action": "updated", "timestamp": "2018-07-16T15:11:44.845Z", "update_id": "e6102aab-3079-435a-ae0d-0397a2cb3c4d", "policies_count": 3} + )), + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_Green_Collectors", json.dumps( + {"policyName": "DCAE_FTL3B.Config_Green_Collectors.1.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Collectors"}, "type": "JSON", "property": null, "config": {"power_source": "lemmings", "conflicting_key": "green_collectors_wins", "package_type": "plastic", "polling_frequency": "30m"}, "policyVersion": "1"} + )), + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific", json.dumps( + {"policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific"}, "type": "JSON", "property": null, "config": {"conflicting_key": "green_eggs_and_ham_are_better", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "bacon": "soft, not crispy", "preparation": "scrambled", "egg_color": "green", "bread": "pumpernickel"}, "policyVersion": "5"} + )), + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_In_Service", json.dumps( + {"policyName": "DCAE_FTL3B.Config_In_Service.1.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "In_Service"}, "type": "JSON", "property": null, "config": {"conflicting_key": "in_service_trumps!", "in_service": true}, "policyVersion": "1"} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KVS_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:policies/items/"): + res_json = [ + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_Green_Collectors", json.dumps( + {"policyName": "DCAE_FTL3B.Config_Green_Collectors.1.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Collectors"}, "type": "JSON", "property": null, "config": {"power_source": "lemmings", "conflicting_key": "green_collectors_wins", "package_type": "plastic", "polling_frequency": "30m"}, "policyVersion": "1"} + )), + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific", json.dumps( + {"policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific"}, "type": "JSON", "property": null, "config": {"conflicting_key": "green_eggs_and_ham_are_better", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "bacon": "soft, not crispy", "preparation": "scrambled", "egg_color": "green", "bread": "pumpernickel"}, "policyVersion": "5"} + )), + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_In_Service", json.dumps( + {"policyName": "DCAE_FTL3B.Config_In_Service.1.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "In_Service"}, "type": "JSON", "property": null, "config": {"conflicting_key": "in_service_trumps!", "in_service": true}, "policyVersion": "1"} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:policies/items/DCAE_FTL3B.Config_Green_Collectors"): + res_json = [ + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_Green_Collectors", json.dumps( + {"policyName": "DCAE_FTL3B.Config_Green_Collectors.1.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Collectors"}, "type": "JSON", "property": null, "config": {"power_source": "lemmings", "conflicting_key": "green_collectors_wins", "package_type": "plastic", "polling_frequency": "30m"}, "policyVersion": "1"} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:policies/items/DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific"): + res_json = [ + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific", json.dumps( + {"policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific"}, "type": "JSON", "property": null, "config": {"conflicting_key": "green_eggs_and_ham_are_better", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "bacon": "soft, not crispy", "preparation": "scrambled", "egg_color": "green", "bread": "pumpernickel"}, "policyVersion": "5"} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1:policies/items/DCAE_FTL3B.Config_In_Service"): + res_json = [ + kv_encode("SCN_1:policies/items/DCAE_FTL3B.Config_In_Service", json.dumps( + {"policyName": "DCAE_FTL3B.Config_In_Service.1.xml", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyConfigStatus": "CONFIG_RETRIEVED", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "In_Service"}, "type": "JSON", "property": null, "config": {"conflicting_key": "in_service_trumps!", "in_service": true}, "policyVersion": "1"} + )) + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "bogus:oti"): + res_json = None + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == "{}/v1/catalog/services".format(os.environ.get("CONSUL_URL").rstrip("/")): + res_json = { + "OTITopologyVM": [], + "apihandler": [], + "cloudify_manager": [], + "config_binding_service": [], + "consul": [], + "dashboard": [], + "deployment_handler": [ + "deployment_handler" + ], + "dmaap_bus_controller": [], + "dmrb": [], + "oti_handler": [ + "oti_handler" + ], + "http_dmaap_bus_controller_api": [], + "https_dmaap_bus_controller_api": [], + "inventory": [ + "inventory" + ], + "pgda-readonly": [], + "pgda-service": [], + "pgda-write": [], + "policy_handler": [ + "policy_handler" + ], + "pstg-readonly": [], + "pstg-service": [], + "pstg-write": [], + "service-change-handler": [ + "service-change-handler" + ], + "zldcdyh1adcc1-component-dockerhost-1": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adcc1-component-dockerhost-2": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adcc1-component-dockerhost-3": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adcc1-component-dockerhost-4": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adcc1-platform-dockerhost-1": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adcc1-platform-dockerhost-2": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adce1-component-dockerhost-1": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adce1-component-dockerhost-2": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adce1-component-dockerhost-3": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adce1-component-dockerhost-4": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adce1-platform-dockerhost-1": [ + "LSLEILAA", + "MDTWNJC1" + ], + "zldcdyh1adce1-platform-dockerhost-2": [ + "LSLEILAA", + "MDTWNJC1" + ] + } + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_SERVICE_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "SCN_1"): + res_json = [ + { + "ID": "966d0ef5-7ca2-1b25-d587-2f0541a6ef78", + "Node": "node_1", + "Address": "10.1.14.15", + "Datacenter": "zldcdyh1adcc1", + "TaggedAddresses": { + "lan": "10.1.14.15", + "wan": "10.1.14.15" + }, + "NodeMeta": { + "consul-network-segment": "", + "fqdn": "kpma00.897658.bogus.com" + }, + "ServiceKind": "", + "ServiceID": "scn-1-service-301", + "ServiceName": "scn-1-service", + "ServiceTags": [ + "com-bogus-dcae-controller" + ], + "ServiceAddress": "scn-1.bogus.com", + "ServiceWeights": { + "Passing": 1, + "Warning": 1 + }, + "ServiceMeta": { + "proto": "http" + }, + "ServicePort": 301, + "ServiceEnableTagOverride": false, + "ServiceProxyDestination": "", + "ServiceProxy": {}, + "ServiceConnect": {}, + "CreateIndex": 30535167, + "ModifyIndex": 30535167 + } + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == ConsulClient.CONSUL_SERVICE_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), "bogus"): + res_json = [ + ] + rv = MonkeyRequestsResponse(full_path, res_json) + + elif full_path == "{}/v1/catalog/node/node_1".format(os.environ.get("CONSUL_URL").rstrip("/")): + res_json = { + "Node": { + "ID": "966d0ef5-7ca2-1b25-d587-2f0541a6ef78", + "Node": "node_1", + "Address": "10.1.14.15", + "Datacenter": "zldcdyh1adcc1", + "TaggedAddresses": { + "lan": "10.1.14.15", + "wan": "10.1.14.15" + }, + "Meta": { + "consul-network-segment": "", + "fqdn": "kpma00.897658.bogus.com" + }, + "CreateIndex": 28443495, + "ModifyIndex": 28443495 + }, + "Services": { + "apple-320": { + "ID": "apple-320", + "Service": "apple", + "Tags": [ + "com-bogus-controller-mgmt" + ], + "Address": "apple.bogus.com", + "Meta": { + "proto": "" + }, + "Port": 320, + "Weights": { + "Passing": 1, + "Warning": 1 + }, + "EnableTagOverride": false, + "ProxyDestination": "", + "Proxy": {}, + "Connect": {}, + "CreateIndex": 28598335, + "ModifyIndex": 28598335 + }, + "banana-service-301": { + "ID": "banana-service-301", + "Service": "banana-service", + "Tags": [ + "com-bogus-controller-dev" + ], + "Address": "banana.bogus.com", + "Meta": { + "proto": "http" + }, + "Port": 301, + "Weights": { + "Passing": 1, + "Warning": 1 + }, + "EnableTagOverride": false, + "ProxyDestination": "", + "Proxy": {}, + "Connect": {}, + "CreateIndex": 30535167, + "ModifyIndex": 30535167 + }, + "d3_kp_platform_kubernetes_master": { + "ID": "d3_kp_platform_kubernetes_master", + "Service": "d3_kp_platform_kubernetes_master", + "Tags": [ + "KGMTNC20" + ], + "Address": "10.1.14.15", + "Meta": null, + "Port": 6443, + "Weights": { + "Passing": 1, + "Warning": 1 + }, + "EnableTagOverride": false, + "ProxyDestination": "", + "Proxy": {}, + "Connect": {}, + "CreateIndex": 28443495, + "ModifyIndex": 28443495 + } + } + } + rv = MonkeyRequestsResponse(full_path, res_json) + + else: + Settings.logger.error("monkey_consul_client_get had no mock for {}".format(full_path)) + res_json = None + rv = MonkeyRequestsResponse(full_path, res_json, status_code=404) + + return rv + +def monkey_consul_client_put(full_path, **kwargs): + """monkeypatch for PUT from consul""" + + Settings.logger.info("monkey_consul_client called with full_path={}, kwargs={}".format(full_path, kwargs)) + rv = False + res_json = {} + if full_path == ConsulClient.CONSUL_TRANSACTION_URL.format(os.environ.get("CONSUL_URL").rstrip("/")): + txn = {} + if 'json' in kwargs: + Settings.logger.info("monkey_consul_client called with txn={}".format(str(kwargs.get('json')))) + txn = kwargs.get('json')[0] + r_dict = { + "Results": [ + { + "KV": { + "LockIndex": 99999, + "Key": txn.get('Key'), + "Flags": 0, + "Value": None, + "CreateIndex": 99999, + "ModifyIndex": 99999 + } + } + ], + "Errors": [ + ] + } + status_code = 200 + KV = txn.get('KV') + if KV and KV.get('Verb') == 'delete' and KV.get('Key') == 'oti_events/anot-her/bogus': + status_code = 409 + r_dict["Errors"].append({ + "OpIndex": 99, + "What": "That KV does not exist." + }) + res_json = [ r_dict ] + Settings.logger.info("monkey_consul_client produced res_json={} with status_code={}".format(json.dumps(res_json), status_code)) + rv = MonkeyRequestsResponse(full_path, res_json, status_code=status_code) + + elif full_path.startswith(ConsulClient.CONSUL_KV_MASK.format(os.environ.get("CONSUL_URL").rstrip("/"), '')): # wants to write + # parse_url = urlparse(url) + # query_dict = dict(parse_qsl(parse_url.query)) + + res_json = True + Settings.logger.info("monkey_consul_client produced res_json={}".format(json.dumps(res_json))) + rv = MonkeyRequestsResponse(full_path, res_json) + + else: + Settings.logger.error("monkey_consul_client_put had no mock for {}".format(full_path)) + + return rv + +class MonkeyCloudifyNode(object): + """fake cloudify node_instance""" + + def __init__(self, **kwargs): + """init locals""" + + self.runtime_properties = kwargs.get('runtime_properties', {}) + self.deployment_id = kwargs.get('deployment_id') + self.node_id = kwargs.get('node_id') + self.id = kwargs.get('id') + self.state = kwargs.get('state') + +class MonkeyCloudifyClient(object): + """monkeypatch for CloudifyClient""" + + def __init__(self, **kwargs): + """init locals""" + + Settings.logger.info("MonkeyCloudifyClient called with kwargs={}".format(json.dumps(kwargs))) + self._host = kwargs.get('host') + self._port = kwargs.get('port') + self._protocol = kwargs.get('protocol') + self._headers = kwargs.get('headers') + + self.node_instances = self + + def list(self, **kwargs): + """list node_instances""" + + Settings.logger.info("MonkeyCloudifyClient.list() called with kwargs={}".format(json.dumps(kwargs))) + rval = [] + deployment_id = kwargs.get('deployment_id') + sort_field = kwargs.get('_sort') + if deployment_id or sort_field: + rval = [ + MonkeyCloudifyNode( + runtime_properties={ + "container_id": "container_1", + "dti_reconfig_script": "dti_reconfig_script_1", + "docker_config": { + "reconfigs": { + "dti": "dti_reconfig_script_1", + "app": "app_reconfig_script_1", + "special": "special_reconfig_script_1" + } + }, + "service_component_name": "SCN_1", + "selected_container_destination": "zldcdyh1adcc1-component-dockerhost-1", + "service_component_type": "SCType_1" + }, + deployment_id = 'deployment_id_1', + node_id = 'node_id_1', + id = 'id_1', + state = 'state_1' + ), + MonkeyCloudifyNode( + runtime_properties={ + "container_id": "container_2", + "dti_reconfig_script": "dti_reconfig_script_2", + "docker_config": { + "reconfigs": { + "dti": "dti_reconfig_script_2", + "app": "app_reconfig_script_2", + "special": "special_reconfig_script_2" + } + }, + "service_component_name": "SCN_2", + "selected_container_destination": "zldcdyh1adcc1-component-dockerhost-1", + "service_component_type": "SCType_2" + }, + deployment_id = 'deployment_id_2', + node_id = 'node_id_2', + id = 'id_2', + state = 'state_2' + ) + ] + + return rval + +class MonkeyEventDbAccess(object): + """monkdypatch for otihandler.dbclient.apis.EventDbAccess()""" + + def __init__(self, **kwargs): + """init locals""" + Settings.logger.info("MonkeyEventDbAccess called with kwargs={}".format(json.dumps(kwargs))) + + def saveDomainObject(self, obj): + return None + + def deleteDomainObject(self, obj): + return None + + def query_event_item(self, target_type, target_name): + Settings.logger.info("MonkeyEventDbAccess.query_event_item({}, {})".format(target_type, target_name)) + return None + + def query_event_data(self, target_type, target_name): + Settings.logger.info("MonkeyEventDbAccess.query_event_data({}, {})".format(target_type, target_name)) + return [] + + def query_event_data_k8s(self, target_type, target_name): + Settings.logger.info("MonkeyEventDbAccess.query_event_data_k8s({}, {})".format(target_type, target_name)) + return [] + + def query_event_info_docker(self, curr_evt, component_scn, deployment_id, container_id): + Settings.logger.info("MonkeyEventDbAccess.query_event_info_docker({}, {}, {}, {})".format(curr_evt, component_scn, deployment_id, container_id)) + return None + + def update_event_item(self, event, target_type, target_name): + Settings.logger.info("MonkeyEventDbAccess.update_event_item({}, {}, {})".format(event, target_type, target_name)) + return None + + def query_raw_k8_events(self, cluster, pod, namespace): + Settings.logger.info("MonkeyEventDbAccess.query_raw_k8_events({}, {}, {})".format(cluster, pod, namespace)) + return [] + + def query_raw_docker_events(self, target_types, locations): + Settings.logger.info("MonkeyEventDbAccess.query_raw_docker_events({}, {})".format(target_types, locations)) + return [] + + def query_event_data_k8s_pod(self, curr_evt, component_scn): + Settings.logger.info("MonkeyEventDbAccess.query_event_k8s_pod({}, {})".format(curr_evt, component_scn)) + return None + +class MonkeyDockerClient(object): + """monkeypatch for docker.APIClient()""" + + def __init__(self, **kwargs): + """init locals""" + + Settings.logger.info("MonkeyDockerClient called with kwargs={}".format(json.dumps(kwargs))) + self._base_url = kwargs.get('base_url') + self._timeout = kwargs.get('timeout') + + def exec_create(self, **kwargs): + """monkey exec_create""" + + return {"Id": "fake_container_ID"} + + def exec_start(self, **kwargs): + """monkey exec_create""" + + return "component reconfigured successfully" + + def login(self, **kwargs): + """monkey login""" + + pass + +@pytest.fixture() +def fix_external_interfaces(monkeypatch): + """monkey consul_client request.get""" + + Settings.logger.info("setup fix_external_interfaces") + monkeypatch.setattr('otihandler.consul_client.requests.get', monkey_consul_client_get) + monkeypatch.setattr('otihandler.consul_client.requests.put', monkey_consul_client_put) + + monkeypatch.setattr('otihandler.cfy_client.CloudifyClient', MonkeyCloudifyClient) + + monkeypatch.setattr('otihandler.docker_client.docker.APIClient', MonkeyDockerClient) + + monkeypatch.setattr('otihandler.dti_processor.EventDbAccess', MonkeyEventDbAccess) + + yield fix_external_interfaces # provide the fixture value + Settings.logger.info("teardown fix_external_interfaces") + + +def monkey_cherrypy_engine_exit(): + """monkeypatch for cherrypy exit""" + + Settings.logger.info("monkey_cherrypy_engine_exit()") + +@pytest.fixture() +def fix_cherrypy_engine_exit(monkeypatch): + """monkey cherrypy.engine.exit()""" + + Settings.logger.info("setup fix_cherrypy_engine_exit") + monkeypatch.setattr('otihandler.web_server.cherrypy.engine.exit', + monkey_cherrypy_engine_exit) + yield fix_cherrypy_engine_exit # provide the fixture value + Settings.logger.info("teardown fix_cherrypy_engine_exit") + + +#----- Tests ---------------------------------------------------------------------------- + +def test_healthcheck(): + """test /healthcheck""" + + Settings.logger.info("=====> test_healthcheck") + audit = Audit(req_message="get /healthcheck") + audit.metrics_start("test /healthcheck") + time.sleep(0.1) + + audit.metrics("test /healthcheck") + health = Audit.health() or {} + audit.audit_done(result=json.dumps(health)) + + Settings.logger.info("healthcheck: %s", json.dumps(health)) + assert bool(health) + +def test_healthcheck_with_error(): + """test /healthcheck""" + + Settings.logger.info("=====> test_healthcheck_with_error") + audit = Audit(req_message="get /healthcheck") + audit.metrics_start("test /healthcheck") + time.sleep(0.2) + audit.error("error from test_healthcheck_with_error") + audit.fatal("fatal from test_healthcheck_with_error") + audit.debug("debug from test_healthcheck_with_error") + audit.warn("warn from test_healthcheck_with_error") + audit.info_requested("info_requested from test_healthcheck_with_error") + if audit.is_success(): + audit.set_http_status_code(AuditHttpCode.DATA_NOT_FOUND_ERROR.value) + audit.set_http_status_code(AuditHttpCode.SERVER_INTERNAL_ERROR.value) + audit.metrics("test /healthcheck") + + health = Audit.health() or {} + audit.audit_done(result=json.dumps(health)) + + Settings.logger.info("healthcheck: %s", json.dumps(health)) + assert bool(health) + +def test_consul_client_lookup_service_bogus(): + """test consul_client.lookup_service with bogus service_name""" + + Settings.logger.info("=====> test_consul_client_lookup_service_bogus") + with pytest.raises(ConsulClientConnectionError, match=r'lookup_service(.*) requests.get(.*)'): + ConsulClient.lookup_service("bogus") + +def test_consul_client_get_service_fqdn_port_none(): + """test consul_client.get_service_fqdn_port with no service_name""" + + Settings.logger.info("=====> test_consul_client_get_service_fqdn_port_none") + with pytest.raises(ConsulClientConnectionError): + rv = ConsulClient.get_service_fqdn_port(None) + assert (rv == None) + +def test_consul_client_store_kvs_none(): + """test consul_client.store_kvs with no key""" + + Settings.logger.info("=====> test_consul_client_store_kvs_none") + rv = ConsulClient.store_kvs(None) + assert (rv == None) + +def test_consul_client_delete_key_none(): + """test consul_client.delete_key with no key""" + + Settings.logger.info("=====> test_consul_client_delete_key_none") + rv = ConsulClient.delete_key(None) + assert (rv == None) + +def test_consul_client_delete_kvs_none(): + """test consul_client.delete_kvs with no key""" + + Settings.logger.info("=====> test_consul_client_delete_kvs_none") + rv = ConsulClient.delete_kvs(None) + assert (rv == None) + +def test_consul_client_delete_kvs_bogus(): + """test consul_client.delete_kvs with bogus key""" + + Settings.logger.info("=====> test_consul_client_delete_kvs_bogus") + rv = ConsulClient.delete_kvs("bogus") + assert (rv == None) + +def test_consul_client_get_value_none(): + """test consul_client.get_value with no key""" + + Settings.logger.info("=====> test_consul_client_get_value_none") + with pytest.raises(ConsulClientConnectionError, match=r'get_value(.*) requests.get(.*)'): + ConsulClient.get_value(None) + +def test_consul_client_get_kvs_none(): + """test consul_client.get_kvs with no prefix""" + + Settings.logger.info("=====> test_consul_client_get_kvs_none") + with pytest.raises(ConsulClientConnectionError, match=r'get_kvs(.*) requests.get(.*)'): + ConsulClient.get_kvs(None) + +def test_consul_client_run_transaction_invalid(): + """test consul_client._run_transaction with invalid operation""" + + Settings.logger.info("=====> test_consul_client_run_transaction_invalid") + rv = ConsulClient._run_transaction("invalid", {"bogus": "bad"}) + assert (rv == None) + +class TestsBase(helper.CPWebCase): + + helper.CPWebCase.interactive = False + +@pytest.mark.usefixtures("fix_external_interfaces") +class WebServerTest(TestsBase): + """testing the web-server - runs tests in alphabetical order of method names""" + + def setup_server(): + """setup the web-server""" + + cherrypy.tree.mount(_DTIWeb(), '/') + + setup_server = staticmethod(setup_server) + + def test_web_healthcheck(self): + """test /healthcheck""" + + Settings.logger.info("=====> test_web_healthcheck") + result = self.getPage("/healthcheck") + Settings.logger.info("got healthcheck: %s", self.body) + self.assertStatus('200 OK') + + def test_web_events_get(self): + """test GET /events -- wrong method""" + + Settings.logger.info("=====> test_web_events_get") + result = self.getPage("/events") + self.assertStatus(404) + + def test_web_events_missing_dcae_service_action(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_missing_dcae_service_action") + body = json.dumps({}) + expected_result = {"ERROR": "dcae_service_action is missing"} + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('400 Bad Request') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_invalid_dcae_service_action(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_invalid_dcae_service_action") + body = json.dumps({"dcae_service_action": "bogus"}) + expected_result = {"ERROR": "dcae_service_action is invalid"} + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('400 Bad Request') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_missing_dcae_target_name(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_missing_dcae_target_name") + body = json.dumps({"dcae_service_action": "deploy"}) + expected_result = {"ERROR": "dcae_target_name is missing"} + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('400 Bad Request') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_missing_dcae_target_type(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_missing_dcae_target_type") + body = json.dumps({"dcae_service_action": "deploy", + "dcae_target_name": "another01ems003" + }) + expected_result = {"ERROR": "dcae_target_type is missing"} + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('400 Bad Request') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_deploy(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_deploy") + body = json.dumps({"dcae_service_action": "deploy", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully" + } + expected_result = { + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_undeploy(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_undeploy") + body = json.dumps({"dcae_service_action": "undeploy", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_add(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_add") + body = json.dumps({"dcae_service_action": "add", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully" + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_delete(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_delete") + body = json.dumps({"dcae_service_action": "delete", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully" + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_update(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_update") + body = json.dumps({"dcae_service_action": "update", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully", + "WARNING": "processing update event for anot-her/another01ems003, but current event info is not found in database, executing add event" + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_notify(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_notify") + body = json.dumps({"dcae_service_action": "notify", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_location(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_location") + body = json.dumps({"dcae_service_action": "deploy", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her", + "dcae_service_location": "LSLEILAA" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully" + } + expected_result = { + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_undeploy_bad(self): + """test POST /events < <dti_event> -- bad dcae_target_name""" + + Settings.logger.info("=====> test_web_events_undeploy_bad") + body = json.dumps({"dcae_service_action": "undeploy", + "dcae_target_name": "bogus", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully", + "WARNING": "VNF instance bogus was not in Consul oti_events historical folder" + } + expected_result = { + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_events_undeploy(self): + """test POST /events < <dti_event>""" + + Settings.logger.info("=====> test_web_events_undeploy") + body = json.dumps({"dcae_service_action": "undeploy", + "dcae_target_name": "another01ems003", + "dcae_target_type": "ANOT-her" + }) + expected_result = { + "SCN_1": "ran dti_reconfig_script_1 in docker container container_1 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_1 node node_id_1, got: component reconfigured successfully", + "SCN_2": "ran dti_reconfig_script_2 in docker container container_2 on zldcdyh1adcc1-component-dockerhost-1 that was deployed by deployment_id_2 node node_id_2, got: component reconfigured successfully" + } + expected_result = { + } + result = self.getPage("/events", method='POST', body=body, + headers=[ + ("Content-Type", "application/json"), + ('Content-Length', str(len(body))) + ]) + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_mockevents(self): + """test GET /mockevents""" + + Settings.logger.info("=====> test_web_mockevents") + expected_result = {"KubeNamespace":"com-my-dcae-test", "KubePod":"pod-0", "KubeServiceName":"pod-0.service.local", "KubeServicePort":"8880", "KubeClusterFqdn":"fqdn-1"} + result = self.getPage("/mockevents") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_docker_events_put(self): + """test PUT /dti_docker_events?service=SCN_1""" + + Settings.logger.info("=====> test_web_dti_docker_events_put") + result = self.getPage("/dti_docker_events?service=SCN_1", method='PUT') + self.assertStatus(404) + + def test_web_dti_docker_events_bad_service(self): + """test GET /dti_docker_events?service=bogus""" + + Settings.logger.info("=====> test_web_dti_docker_events_bad_service") + expected_result = {} + result = self.getPage("/dti_docker_events?service=bogus") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_docker_events(self): + """test GET /dti_docker_events?service=SCN_1""" + + Settings.logger.info("=====> test_web_dti_docker_events") + expected_result = {} + result = self.getPage("/dti_docker_events?service=SCN_1") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_docker_events_bad_location(self): + """test GET /dti_docker_events?service=SCN_1&location=bogus""" + + Settings.logger.info("=====> test_web_dti_docker_events_bad_location") + expected_result = {} + result = self.getPage("/dti_docker_events?service=SCN_1&location=bogus") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_docker_events_location(self): + """test GET /dti_docker_events?service=SCN_1&location=LSLEILAA""" + + Settings.logger.info("=====> test_web_dti_docker_events_location") + expected_result = {} + result = self.getPage("/dti_docker_events?service=SCN_1&location=LSLEILAA") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_docker_events_locations(self): + """test GET /dti_docker_events?service=SCN_1&location=LSLEILAA,MDTWNJC1""" + + Settings.logger.info("=====> test_web_dti_docker_events_locations") + expected_result = {} + result = self.getPage("/dti_docker_events?service=SCN_1&location=LSLEILAA,MDTWNJC1") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_docker_events_bad_locations(self): + """test GET /dti_docker_events?service=SCN_1&location=LSLEILAA,bogus,MDTWNJC1""" + + Settings.logger.info("=====> test_web_dti_docker_events_bad_locations") + expected_result = {} + result = self.getPage("/dti_docker_events?service=SCN_1&location=LSLEILAA,bogus,MDTWNJC1") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_oti_docker_events_put(self): + """test PUT /oti_docker_events?service=SCN_1""" + + Settings.logger.info("=====> test_web_oti_docker_events_put") + result = self.getPage("/oti_docker_events?service=SCN_1", method='PUT') + self.assertStatus(404) + + def test_web_oti_docker_events_bad_service(self): + """test GET /oti_docker_events?service=bogus""" + + Settings.logger.info("=====> test_web_oti_docker_events_bad_service") + expected_result = {} + result = self.getPage("/oti_docker_events?service=bogus") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_oti_docker_events(self): + """test GET /oti_docker_events?service=SCN_1""" + + Settings.logger.info("=====> test_web_oti_docker_events") + expected_result = {} + result = self.getPage("/oti_docker_events?service=SCN_1") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_oti_docker_events_bad_location(self): + """test GET /oti_docker_events?service=SCN_1&location=bogus""" + + Settings.logger.info("=====> test_web_oti_docker_events_bad_location") + expected_result = {} + result = self.getPage("/oti_docker_events?service=SCN_1&location=bogus") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_oti_docker_events_location(self): + """test GET /oti_docker_events?service=SCN_1&location=LSLEILAA""" + + Settings.logger.info("=====> test_web_oti_docker_events_location") + expected_result = {} + result = self.getPage("/oti_docker_events?service=SCN_1&location=LSLEILAA") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_oti_docker_events_locations(self): + """test GET /oti_docker_events?service=SCN_1&location=LSLEILAA,MDTWNJC1""" + + Settings.logger.info("=====> test_web_oti_docker_events_locations") + expected_result = {} + result = self.getPage("/oti_docker_events?service=SCN_1&location=LSLEILAA,MDTWNJC1") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_oti_docker_events_bad_locations(self): + """test GET /oti_docker_events?service=SCN_1&location=LSLEILAA,bogus,MDTWNJC1""" + + Settings.logger.info("=====> test_web_oti_docker_events_bad_locations") + expected_result = {} + result = self.getPage("/oti_docker_events?service=SCN_1&location=LSLEILAA,bogus,MDTWNJC1") + self.assertStatus('200 OK') + Settings.logger.info("got result: %s", self.body) + assert ( json.loads(self.body) == expected_result ) + + def test_web_reconfig_put(self): + """test PUT /reconfig -- wrong method""" + + Settings.logger.info("=====> test_web_reconfig_put") + result = self.getPage("/reconfig/deployment_id_1", method='PUT') + self.assertStatus(404) + + def test_web_dti_put(self): + """test PUT /dti -- wrong method""" + + Settings.logger.info("=====> test_web_dti_put") + result = self.getPage("/dti", method='PUT') + self.assertStatus(404) + + def test_web_dti(self): + """test GET /dti""" + + Settings.logger.info("=====> test_web_dti") + result = self.getPage("/dti") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "anot-her": { + "another01ems003": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems042": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems042", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems044": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems044", "dcae_service_location": "MDTWNJC1", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_SCN_bogus(self): + """test GET /dti/<service_name> -- bogus SCN""" + + Settings.logger.info("=====> test_web_dti_SCN_bogus") + result = self.getPage("/dti/SCN_bogus") + self.assertStatus(404) + + def test_web_dti_SCN(self): + """test GET /dti/<service_name>""" + + Settings.logger.info("=====> test_web_dti_SCN") + result = self.getPage("/dti/SCN_1") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "anot-her": { + "another01ems003": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems042": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems042", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems044": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems044", "dcae_service_location": "MDTWNJC1", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_SCN_type(self): + """test GET /dti/<service_name>?vnf_type=<vnf_type>""" + + Settings.logger.info("=====> test_web_dti_SCN_type") + result = self.getPage("/dti/SCN_1?vnf_type=ANOT-her") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "another01ems003": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems042": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems042", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems044": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems044", "dcae_service_location": "MDTWNJC1", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_types(self): + """test GET /dti?vnf_type=<vnf_types>""" + + Settings.logger.info("=====> test_web_dti_types") + result = self.getPage("/dti?vnf_type=ANOT-her,new-type") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "anot-her": { + "another01ems003": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems042": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems042", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems044": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems044", "dcae_service_location": "MDTWNJC1", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_SCN_type_miss(self): + """test GET /dti/<service_name>?vnf_type=<vnf_type>""" + + Settings.logger.info("=====> test_web_dti_SCN_type_miss") + result = self.getPage("/dti/SCN_1?vnf_type=NO-match") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {} + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_SCN_type_vnf_id(self): + """test GET /dti/<service_name>?vnf_type=<vnf_type>;vnf_id=<vnf_id>""" + + Settings.logger.info("=====> test_web_dti_SCN_type_vnf_id") + result = self.getPage("/dti/SCN_1?vnf_type=ANOT-her;vnf_id=another01ems003") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_SCN_type_vnf_id_location(self): + """test GET /dti/<service_name>?vnf_type=<vnf_type>;vnf_id=<vnf_id>;service_location=<service_location>""" + + Settings.logger.info("=====> test_web_dti_SCN_type_vnf_id_location") + result = self.getPage("/dti/SCN_1?vnf_type=ANOT-her;vnf_id=another01ems003;service_location=LSLEILAA") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_SCN_types_location(self): + """test GET /dti/<service_name>?vnf_type=<vnf_types>;service_location=<service_location>""" + + Settings.logger.info("=====> test_web_dti_SCN_types_location") + result = self.getPage("/dti/SCN_1?vnf_type=ANOT-her,new-type;service_location=MDTWNJC1") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "anot-her": { + "another01ems044": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems044", "dcae_service_location": "MDTWNJC1", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems044", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_location(self): + """test GET /dti?service_location=<service_location>""" + + Settings.logger.info("=====> test_web_dti_location") + result = self.getPage("/dti?service_location=LSLEILAA") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "anot-her": { + "another01ems003": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems042": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems042", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_dti_type_location(self): + """test GET /dti?vnf_type=<vnf_type>;service_location=<service_location>""" + + Settings.logger.info("=====> test_web_dti_type_location") + result = self.getPage("/dti?vnf_type=ANOT-her;service_location=LSLEILAA") + Settings.logger.info("got dti: %s", self.body) + self.assertStatus('200 OK') + + expected_result = { + "another01ems003": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems003", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.3", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "remoteServerName": "another01ems003", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}}, + "another01ems042": {"dcae_service_action": "deploy", "dcae_service-instance_model-version-id": "1", "dcae_target_name": "another01ems042", "dcae_service_location": "LSLEILAA", "dcae_target_type": "ANOT-her", "dcae_target_collection": "true", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_in-maint": "false", "dcae_snmp_community_string": "my_first_community", "dcae_generic-vnf_model-version-id": "1", "dcae_target_collection_ip": "107.239.85.42", "dcae_snmp_version": "2c", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"nodeType": "VHSS", "description": "VHSS Data Collection", "protocol": "sftp", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "priority": 1, "nodeSubtype": "", "collectionInterval": "300", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "remoteServerName": "another01ems042", "isPrimary": "true"}], "serverGroupId": "g1"}}}}}, "dcae_target_prov-status": "PROV", "event": {}} + } + assert ( json.loads(self.body) == expected_result ) + + def test_web_service_component_put(self): + """test PUT /service_component -- wrong method""" + + Settings.logger.info("=====> test_web_service_component_put") + result = self.getPage("/service_component/SCN_1", method='PUT') + self.assertStatus(404) + + def test_web_service_component_bogus(self): + """test GET /service_component/<service_name> -- bogus SCN""" + + Settings.logger.info("=====> test_web_service_component_bogus") + result = self.getPage("/service_component/SCN_bogus") + self.assertStatus(404) + + def test_web_service_component(self): + """test GET /service_component/<service_name>""" + + Settings.logger.info("=====> test_web_service_component") + result = self.getPage("/service_component/SCN_1") + Settings.logger.info("got service_component: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"dcae_target_type": ["pnga-xxx"]} + assert ( json.loads(self.body) == expected_result ) + + def test_web_service_component_all_put(self): + """test PUT /service_component_all -- wrong method""" + + Settings.logger.info("=====> test_web_service_component_all_put") + result = self.getPage("/service_component_all/SCN_1", method='PUT') + self.assertStatus(404) + + def test_web_service_component_all_bogus(self): + """test GET /service_component_all/<service_name> -- bogus SCN""" + + Settings.logger.info("=====> test_web_service_component_all_bogus") + result = self.getPage("/service_component_all/SCN_bogus") + self.assertStatus(404) + + def test_web_service_component_all(self): + """test GET /service_component_all/<service_name>""" + + Settings.logger.info("=====> test_web_service_component_all") + result = self.getPage("/service_component_all/SCN_1") + Settings.logger.info("got service_component_all: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"oti": {"anot-her": {"another01ems003": {"dcae_target_name": "another01ems003", "dcae_target_collection_ip": "107.239.85.3", "event": {}, "dcae_service-instance_model-version-id": "1", "dcae_service_location": "LSLEILAA", "dcae_target_in-maint": "false", "dcae_service_action": "deploy", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_collection": "true", "aai_additional_info": {"TasksItems": {"another01ems003_2PMOBATTHSSEMS0165": {"collectionInterval": "300", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.3", "isPrimary": "true", "remoteServerName": "another01ems003"}], "serverGroupId": "g1"}}, "nodeType": "VHSS", "protocol": "sftp", "nodeSubtype": "", "priority": 1, "description": "VHSS Data Collection"}}}, "dcae_generic-vnf_model-version-id": "1", "dcae_target_prov-status": "PROV", "dcae_target_type": "ANOT-her", "dcae_snmp_community_string": "my_first_community", "dcae_snmp_version": "2c"}, "another01ems042": {"dcae_target_name": "another01ems042", "dcae_target_collection_ip": "107.239.85.42", "event": {}, "dcae_service-instance_model-version-id": "1", "dcae_service_location": "LSLEILAA", "dcae_target_in-maint": "false", "dcae_service_action": "deploy", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_collection": "true", "aai_additional_info": {"TasksItems": {"another01ems042_2PMOBATTHSSEMS0165": {"collectionInterval": "300", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "isPrimary": "true", "remoteServerName": "another01ems042"}], "serverGroupId": "g1"}}, "nodeType": "VHSS", "protocol": "sftp", "nodeSubtype": "", "priority": 1, "description": "VHSS Data Collection"}}}, "dcae_generic-vnf_model-version-id": "1", "dcae_target_prov-status": "PROV", "dcae_target_type": "ANOT-her", "dcae_snmp_community_string": "my_first_community", "dcae_snmp_version": "2c"}, "another01ems044": {"dcae_target_name": "another01ems044", "dcae_target_collection_ip": "107.239.85.42", "event": {}, "dcae_service-instance_model-version-id": "1", "dcae_service_location": "MDTWNJC1", "dcae_target_in-maint": "false", "dcae_service_action": "deploy", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_collection": "true", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"collectionInterval": "300", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "isPrimary": "true", "remoteServerName": "another01ems044"}], "serverGroupId": "g1"}}, "nodeType": "VHSS", "protocol": "sftp", "nodeSubtype": "", "priority": 1, "description": "VHSS Data Collection"}}}, "dcae_generic-vnf_model-version-id": "1", "dcae_target_prov-status": "PROV", "dcae_target_type": "ANOT-her", "dcae_snmp_community_string": "my_first_community", "dcae_snmp_version": "2c"}}}, "policies": {"event": {"update_id": "e6102aab-3079-435a-ae0d-0397a2cb3c4d", "action": "updated", "timestamp": "2018-07-16T15:11:44.845Z", "policies_count": 3}, "items": {"DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific": {"property": null, "policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml", "policyConfigStatus": "CONFIG_RETRIEVED", "config": {"preparation": "scrambled", "egg_color": "green", "bread": "pumpernickel", "conflicting_key": "green_eggs_and_ham_are_better", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "bacon": "soft, not crispy"}, "responseAttributes": {}, "type": "JSON", "policyVersion": "5", "policyConfigMessage": "Config Retrieved! ", "matchingConditions": {"ONAPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific", "ECOMPName": "dcae"}}, "DCAE_FTL3B.Config_Green_Collectors": {"property": null, "policyName": "DCAE_FTL3B.Config_Green_Collectors.1.xml", "policyConfigStatus": "CONFIG_RETRIEVED", "config": {"power_source": "lemmings", "conflicting_key": "green_collectors_wins", "polling_frequency": "30m", "package_type": "plastic"}, "responseAttributes": {}, "type": "JSON", "policyVersion": "1", "policyConfigMessage": "Config Retrieved! ", "matchingConditions": {"ONAPName": "dcae", "ConfigName": "Green_Collectors", "ECOMPName": "dcae"}}, "DCAE_FTL3B.Config_In_Service": {"property": null, "policyName": "DCAE_FTL3B.Config_In_Service.1.xml", "policyConfigStatus": "CONFIG_RETRIEVED", "config": {"conflicting_key": "in_service_trumps!", "in_service": true}, "responseAttributes": {}, "type": "JSON", "policyVersion": "1", "policyConfigMessage": "Config Retrieved! ", "matchingConditions": {"ONAPName": "dcae", "ConfigName": "In_Service", "ECOMPName": "dcae"}}}}, "config": {"dcae_target_type": ["pnga-xxx"]}} + assert ( json.loads(self.body) == expected_result ) + + def test_web_service_component_all_location(self): + """test GET /service_component_all/<service_name>?service_location=<service_location>""" + + Settings.logger.info("=====> test_web_service_component_all_location") + result = self.getPage("/service_component_all/SCN_1?service_location=MDTWNJC1") + Settings.logger.info("got service_component_all: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"oti": {"anot-her": {"another01ems044": {"dcae_target_name": "another01ems044", "dcae_target_collection_ip": "107.239.85.42", "event": {}, "dcae_service-instance_model-version-id": "1", "dcae_service_location": "MDTWNJC1", "dcae_target_in-maint": "false", "dcae_service_action": "deploy", "dcae_target_is-closed-loop-disabled": "false", "dcae_target_collection": "true", "aai_additional_info": {"TasksItems": {"another01ems044_2PMOBATTHSSEMS0165": {"collectionInterval": "300", "serviceType": "MOB-VHSS", "vnfType": "VHSS", "taskId": "2PMOBATTHSSEMS0165", "remoteServerGroups": {"g1": {"serverGroup": [{"remoteServerIp": "107.239.85.42", "isPrimary": "true", "remoteServerName": "another01ems044"}], "serverGroupId": "g1"}}, "nodeType": "VHSS", "protocol": "sftp", "nodeSubtype": "", "priority": 1, "description": "VHSS Data Collection"}}}, "dcae_generic-vnf_model-version-id": "1", "dcae_target_prov-status": "PROV", "dcae_target_type": "ANOT-her", "dcae_snmp_community_string": "my_first_community", "dcae_snmp_version": "2c"}}}, "policies": {"event": {"update_id": "e6102aab-3079-435a-ae0d-0397a2cb3c4d", "action": "updated", "timestamp": "2018-07-16T15:11:44.845Z", "policies_count": 3}, "items": {"DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific": {"property": null, "policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml", "policyConfigStatus": "CONFIG_RETRIEVED", "config": {"preparation": "scrambled", "egg_color": "green", "bread": "pumpernickel", "conflicting_key": "green_eggs_and_ham_are_better", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "bacon": "soft, not crispy"}, "responseAttributes": {}, "type": "JSON", "policyVersion": "5", "policyConfigMessage": "Config Retrieved! ", "matchingConditions": {"ONAPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific", "ECOMPName": "dcae"}}, "DCAE_FTL3B.Config_Green_Collectors": {"property": null, "policyName": "DCAE_FTL3B.Config_Green_Collectors.1.xml", "policyConfigStatus": "CONFIG_RETRIEVED", "config": {"power_source": "lemmings", "conflicting_key": "green_collectors_wins", "polling_frequency": "30m", "package_type": "plastic"}, "responseAttributes": {}, "type": "JSON", "policyVersion": "1", "policyConfigMessage": "Config Retrieved! ", "matchingConditions": {"ONAPName": "dcae", "ConfigName": "Green_Collectors", "ECOMPName": "dcae"}}, "DCAE_FTL3B.Config_In_Service": {"property": null, "policyName": "DCAE_FTL3B.Config_In_Service.1.xml", "policyConfigStatus": "CONFIG_RETRIEVED", "config": {"conflicting_key": "in_service_trumps!", "in_service": true}, "responseAttributes": {}, "type": "JSON", "policyVersion": "1", "policyConfigMessage": "Config Retrieved! ", "matchingConditions": {"ONAPName": "dcae", "ConfigName": "In_Service", "ECOMPName": "dcae"}}}}, "config": {"dcae_target_type": ["pnga-xxx"]}} + assert ( json.loads(self.body) == expected_result ) + + def test_web_policies_put(self): + """test PUT /policies/<service_name> -- wrong method""" + + Settings.logger.info("=====> test_web_policies_put") + result = self.getPage("/policies/SCN_1", method='PUT') + self.assertStatus(404) + + def test_web_policies_bogus(self): + """test GET /policies/<service_name> -- bogus SCN""" + + Settings.logger.info("=====> test_web_policies_bogus") + result = self.getPage("/policies/SCN_bogus") + self.assertStatus(404) + + def test_web_policies(self): + """test GET /policies/<service_name>""" + + Settings.logger.info("=====> test_web_policies") + result = self.getPage("/policies/SCN_1") + Settings.logger.info("got policies: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"DCAE_FTL3B.Config_In_Service": {"type": "JSON", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyVersion": "1", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "In_Service"}, "policyConfigStatus": "CONFIG_RETRIEVED", "property": null, "config": {"conflicting_key": "in_service_trumps!", "in_service": true}, "policyName": "DCAE_FTL3B.Config_In_Service.1.xml"}, "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific": {"type": "JSON", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyVersion": "5", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific"}, "policyConfigStatus": "CONFIG_RETRIEVED", "property": null, "config": {"preparation": "scrambled", "bread": "pumpernickel", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "conflicting_key": "green_eggs_and_ham_are_better", "egg_color": "green", "bacon": "soft, not crispy"}, "policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml"}, "DCAE_FTL3B.Config_Green_Collectors": {"type": "JSON", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyVersion": "1", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Collectors"}, "policyConfigStatus": "CONFIG_RETRIEVED", "property": null, "config": {"conflicting_key": "green_collectors_wins", "package_type": "plastic", "power_source": "lemmings", "polling_frequency": "30m"}, "policyName": "DCAE_FTL3B.Config_Green_Collectors.1.xml"}} + assert ( json.loads(self.body) == expected_result ) + + def test_web_policies_policy(self): + """test GET /policies/<service_name>?policy_id=<policy_id>""" + + Settings.logger.info("=====> test_web_policies_policy") + result = self.getPage("/policies/SCN_1?policy_id=DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific") + Settings.logger.info("got policies: %s", self.body) + self.assertStatus('200 OK') + + expected_result = {"type": "JSON", "policyConfigMessage": "Config Retrieved! ", "responseAttributes": {}, "policyVersion": "5", "matchingConditions": {"ONAPName": "dcae", "ECOMPName": "dcae", "ConfigName": "Green_Eggs_and_Ham_specific"}, "policyConfigStatus": "CONFIG_RETRIEVED", "property": null, "config": {"preparation": "scrambled", "bread": "pumpernickel", "dcae_target_type": ["pnga-xxx", "pcrf-oam", "vhss-ems", "anot-her", "new-type"], "conflicting_key": "green_eggs_and_ham_are_better", "egg_color": "green", "bacon": "soft, not crispy"}, "policyName": "DCAE_FTL3B.Config_Green_Eggs_and_Ham_specific.5.xml"} + assert ( json.loads(self.body) == expected_result ) + + @pytest.mark.usefixtures("fix_cherrypy_engine_exit") + def test_zzz_web_shutdown(self): + """test /shutdown""" + + Settings.logger.info("=====> test_zzz_web_shutdown") + Settings.logger.info("sleep before shutdown...") + time.sleep(1) + + result = self.getPage("/shutdown") + Settings.logger.info("shutdown result: %s", result) + self.assertStatus('200 OK') + Settings.logger.info("got shutdown: %s", self.body) + self.assertInBody('goodbye! shutdown requested ') + time.sleep(1) diff --git a/oti/event-handler/tox-local.ini b/oti/event-handler/tox-local.ini new file mode 100644 index 0000000..fdfa4fc --- /dev/null +++ b/oti/event-handler/tox-local.ini @@ -0,0 +1,16 @@ +# tox -c tox-local.ini +[tox] +envlist = py36 +skip_missing_interpreters = true + +[testenv] +deps= + -rrequirements.txt + pytest + coverage + pytest-cov +setenv = + PYTHONPATH={toxinidir} +recreate = True +commands= + pytest --cov otihandler --cov-report=html --cov-report=term --verbose tests diff --git a/oti/event-handler/tox.ini b/oti/event-handler/tox.ini index 2532eb9..b801f95 100644 --- a/oti/event-handler/tox.ini +++ b/oti/event-handler/tox.ini @@ -1,4 +1,16 @@ +# tox [tox] envlist = py36 +skip_missing_interpreters = true [testenv] +deps= + -rrequirements.txt + pytest + coverage + pytest-cov +setenv = + PYTHONPATH={toxinidir} +recreate = True +commands= + pytest --cov otihandler --cov-report=xml --cov-report=term --verbose tests diff --git a/releases/1.0.0-acumos-adapter-container.yaml b/releases/1.0.0-acumos-adapter-container.yaml new file mode 100644 index 0000000..76f6b1b --- /dev/null +++ b/releases/1.0.0-acumos-adapter-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '1.0.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-adapter-acumos-docker-merge-master/3' +ref: 4da2d08fc132367b38c3ec555f931a175cfcbfcd +containers: + - name: 'org.onap.dcaegen2.platform.adapter.acumos' + version: '1.0.0-SNAPSHOT-20200303T215210Z'
\ No newline at end of file diff --git a/releases/1.0.0-designtool-container.yaml b/releases/1.0.0-designtool-container.yaml new file mode 100644 index 0000000..28974dd --- /dev/null +++ b/releases/1.0.0-designtool-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '1.0.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-mod-master-designtool-merge-java/2' +ref: 747ca040f85851b33a2be7abb58426dd25008d2e +containers: + - name: 'org.onap.dcaegen2.platform.mod.designtool-web' + version: '1.0.0-SNAPSHOT-20200217T165545Z' diff --git a/releases/1.0.0-distributorapi-container.yaml b/releases/1.0.0-distributorapi-container.yaml new file mode 100644 index 0000000..76870c4 --- /dev/null +++ b/releases/1.0.0-distributorapi-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '1.0.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-mod-distributorapi-docker-merge-master/4' +ref: 34b776928e1a0fa029d2de13a020873bff8a601f +containers: + - name: 'org.onap.dcaegen2.platform.mod.distributorapi' + version: '1.0.0-SNAPSHOT-20200226T234626Z'
\ No newline at end of file diff --git a/releases/1.0.0-genprocessor-container.yaml b/releases/1.0.0-genprocessor-container.yaml new file mode 100644 index 0000000..f2bbcdf --- /dev/null +++ b/releases/1.0.0-genprocessor-container.yaml @@ -0,0 +1,10 @@ +distribution_type: 'container' +container_release_tag: '1.0.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-mod-master-genprocessor-merge-java/8' +ref: 534f8a3b979ae78a21ec3b7b8ffdb1cd3e425f1a +containers: + - name: 'org.onap.dcaegen2.platform.mod.genprocessor-job' + version: '1.0.0-20200217T215940Z' + - name: 'org.onap.dcaegen2.platform.mod.genprocessor-http' + version: '1.0.0-20200217T215940Z'
\ No newline at end of file diff --git a/releases/1.0.0-mod-nifi-registry-container.yaml b/releases/1.0.0-mod-nifi-registry-container.yaml new file mode 100644 index 0000000..f7a1bfc --- /dev/null +++ b/releases/1.0.0-mod-nifi-registry-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '1.0.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-mod-master-designtool-merge-java/2' +ref: 747ca040f85851b33a2be7abb58426dd25008d2e +containers: + - name: 'org.onap.dcaegen2.platform.mod.mod-registry' + version: '1.0.0-SNAPSHOT-20200217T165545Z'
\ No newline at end of file diff --git a/releases/1.0.0-runtimeapi-container.yaml b/releases/1.0.0-runtimeapi-container.yaml new file mode 100644 index 0000000..a96424a --- /dev/null +++ b/releases/1.0.0-runtimeapi-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '1.0.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-mod-master-runtimeapi-merge-java/9' +ref: 7666d2a36849f88e917d87abec2e177dac500191 +containers: + - name: 'org.onap.dcaegen2.platform.mod.runtime-web' + version: '1.0.0-20200228T221655Z'
\ No newline at end of file diff --git a/releases/1.3.1-blueprint-generator.yaml b/releases/1.3.1-blueprint-generator.yaml new file mode 100644 index 0000000..9359463 --- /dev/null +++ b/releases/1.3.1-blueprint-generator.yaml @@ -0,0 +1,4 @@ +distribution_type: 'maven' +version: '1.3.1' +project: 'dcaegen2/platform' +log_dir: 'dcaegen2-platform-mod-bpgenerator-maven-stage-master/18' diff --git a/releases/2.12.0-onboardingapi-container.yaml b/releases/2.12.0-onboardingapi-container.yaml new file mode 100644 index 0000000..35db855 --- /dev/null +++ b/releases/2.12.0-onboardingapi-container.yaml @@ -0,0 +1,8 @@ +distribution_type: 'container' +container_release_tag: '2.12.0' +project: 'dcaegen2-platform' +log_dir: 'dcaegen2-platform-mod-onboardingapi-docker-merge-master/4' +ref: 56c650139f899f1a6d271ed80780a9b576d7ff22 +containers: + - name: 'org.onap.dcaegen2.platform.mod.onboardingapi' + version: '2.12.0-SNAPSHOT-20200228T144346Z'
\ No newline at end of file |