US3541 merge various fixes to OPNFV branch

timestamp of last commit tt was merged: 26-Jan-2018 16:25.

Change-Id: I7b0bf7885d7d0badb81c794a52c480b905d78459
Signed-off-by: yayogev <yaronyogev@gmail.com>

9 files changed, 22 insertions, 19 deletions

diff --git a/app/discover/events/event_base.py b/app/discover/events/event_base.py
index 6b3b290..4b466e1 100644
--- a/app/discover/events/event_base.py
+++ b/app/discover/events/event_base.py
@@ -11,6 +11,7 @@ from abc import abstractmethod, ABC
 
 from discover.fetcher import Fetcher
 from utils.inventory_mgr import InventoryMgr
+from utils.origins import ScanOrigin, ScanOrigins
 
 
 class EventResult:
@@ -23,6 +24,8 @@ class EventResult:
         self.message = message
         self.related_object = related_object
         self.display_context = display_context
+        self.origin = ScanOrigin(origin_id=None,
+                                 origin_type=ScanOrigins.EVENT)
 
 
 class EventBase(Fetcher, ABC):
diff --git a/app/discover/events/event_instance_add.py b/app/discover/events/event_instance_add.py
index 4dd2b20..a8717a5 100644
--- a/app/discover/events/event_instance_add.py
+++ b/app/discover/events/event_instance_add.py
@@ -25,7 +25,7 @@ class EventInstanceAdd(EventBase):
 
         # scan instance
         scanner = Scanner()
-        scanner.set_env(env)
+        scanner.setup(env=env, origin=self.origin)
         scanner.scan("ScanInstancesRoot", instances_root,
                      limit_to_child_id=instance_id,
                      limit_to_child_type='instance')
diff --git a/app/discover/events/event_interface_add.py b/app/discover/events/event_interface_add.py
index e54bedb..f0ba569 100644
--- a/app/discover/events/event_interface_add.py
+++ b/app/discover/events/event_interface_add.py
@@ -30,7 +30,7 @@ class EventInterfaceAdd(EventBase):
 
     def add_gateway_port(self, env, project, network_name, router_doc, host_id):
         fetcher = CliFetchHostVservice()
-        fetcher.set_env(env)
+        fetcher.setup(env=env, origin=self.origin)
         router_id = router_doc['id']
         router = fetcher.get_vservice(host_id, router_id)
         device_id = decode_router_id(router_id)
@@ -101,7 +101,7 @@ class EventInterfaceAdd(EventBase):
         # add router-interface port document.
         if not ApiAccess.regions:
             fetcher = ApiFetchRegions()
-            fetcher.set_env(env)
+            fetcher.setup(env=env, origin=self.origin)
             fetcher.get(project_id)
         port_doc = EventSubnetAdd().add_port_document(env, port_id,
                                                       network_name=network_name)
@@ -134,7 +134,7 @@ class EventInterfaceAdd(EventBase):
         # update vservice-vnic, vnic-network,
         FindLinksForVserviceVnics().add_links(search={"parent_id": router_id})
         scanner = Scanner()
-        scanner.set_env(env)
+        scanner.setup(env=env, origin=self.origin)
 
         scanner.scan_cliques()
         self.log.info("Finished router-interface added.")
diff --git a/app/discover/events/event_port_add.py b/app/discover/events/event_port_add.py
index 9220015..e03db34 100644
--- a/app/discover/events/event_port_add.py
+++ b/app/discover/events/event_port_add.py
@@ -168,7 +168,7 @@ class EventPortAdd(EventBase):
                     "router": ('Gateways', router_name)}
 
         fetcher = CliFetchVserviceVnics()
-        fetcher.set_env(env)
+        fetcher.setup(env=env, origin=self.origin)
         namespace = 'q{}-{}'.format(object_type, object_id)
         vnic_documents = fetcher.handle_service(host['id'], namespace, enable_cache=False)
         if not vnic_documents:
@@ -258,7 +258,7 @@ class EventPortAdd(EventBase):
 
             # update instance
             instance_fetcher = ApiFetchHostInstances()
-            instance_fetcher.set_env(env)
+            instance_fetcher.setup(env=env, origin=self.origin)
             instance_docs = instance_fetcher.get(host_id + '-')
             instance = next(filter(lambda i: i['id'] == instance_id, instance_docs), None)
 
@@ -278,7 +278,7 @@ class EventPortAdd(EventBase):
                 # set ovs as default type.
                 vnic_fetcher = CliFetchInstanceVnics()
 
-            vnic_fetcher.set_env(env)
+            vnic_fetcher.setup(env=env, origin=self.origin)
             vnic_docs = vnic_fetcher.get(instance_id + '-')
             vnic = next(filter(lambda vnic: vnic['mac_address'] == mac_address, vnic_docs), None)
 
@@ -298,7 +298,7 @@ class EventPortAdd(EventBase):
             for fetcher in fetchers_implementing_add_links:
                 fetcher.add_links()
             scanner = Scanner()
-            scanner.set_env(env)
+            scanner.setup(env=env, origin=self.origin)
             scanner.scan_cliques()
 
         port_document = self.inv.get_by_id(env, port['id'])
diff --git a/app/discover/events/event_port_delete.py b/app/discover/events/event_port_delete.py
index 1e55870..937d8df 100644
--- a/app/discover/events/event_port_delete.py
+++ b/app/discover/events/event_port_delete.py
@@ -61,7 +61,7 @@ class EventPortDelete(EventDeleteBase):
             # update instance mac address.
             if port_doc['mac_address'] == instance_doc['mac_address']:
                 instance_fetcher = ApiFetchHostInstances()
-                instance_fetcher.set_env(env)
+                instance_fetcher.setup(env=env, origin=self.origin)
                 host_id = port_doc['binding:host_id']
                 instance_id = port_doc['device_id']
                 instance_docs = instance_fetcher.get(host_id + '-')
diff --git a/app/discover/events/event_router_add.py b/app/discover/events/event_router_add.py
index 1fb2244..0f8bc05 100644
--- a/app/discover/events/event_router_add.py
+++ b/app/discover/events/event_router_add.py
@@ -100,7 +100,7 @@ class EventRouterAdd(EventBase):
         host = self.inv.get_by_id(env, host_id)
 
         fetcher = CliFetchHostVservice()
-        fetcher.set_env(env)
+        fetcher.setup(env=env, origin=self.origin)
         router_doc = fetcher.get_vservice(host_id, router_id)
         gateway_info = router['external_gateway_info']
 
@@ -114,7 +114,7 @@ class EventRouterAdd(EventBase):
         # scan links and cliques
         FindLinksForVserviceVnics().add_links(search={"parent_id": router_id})
         scanner = Scanner()
-        scanner.set_env(env)
+        scanner.setup(env=env, origin=self.origin)
         scanner.scan_cliques()
         self.log.info("Finished router added.")
 
diff --git a/app/discover/events/event_router_update.py b/app/discover/events/event_router_update.py
index b63b224..f20f07e 100644
--- a/app/discover/events/event_router_update.py
+++ b/app/discover/events/event_router_update.py
@@ -60,7 +60,7 @@ class EventRouterUpdate(EventBase):
 
             # add gw_port_id info and port document.
             fetcher = CliFetchHostVservice()
-            fetcher.set_env(env)
+            fetcher.setup(env=env, origin=self.origin)
             router_vservice = fetcher.get_vservice(host_id, router_full_id)
             if router_vservice.get('gw_port_id'):
                 router_doc['gw_port_id'] = router_vservice['gw_port_id']
@@ -74,7 +74,7 @@ class EventRouterUpdate(EventBase):
 
         # update the cliques.
         scanner = Scanner()
-        scanner.set_env(env)
+        scanner.setup(env=env, origin=self.origin)
         scanner.scan_cliques()
         self.log.info("Finished router update.")
         return EventResult(result=True,
diff --git a/app/discover/events/event_subnet_add.py b/app/discover/events/event_subnet_add.py
index 4126e0c..0a91803 100644
--- a/app/discover/events/event_subnet_add.py
+++ b/app/discover/events/event_subnet_add.py
@@ -29,7 +29,7 @@ class EventSubnetAdd(EventBase):
         # document does not has project attribute. In this case, network_name should not be provided.
 
         fetcher = ApiFetchPort()
-        fetcher.set_env(env)
+        fetcher.setup(env=env, origin=self.origin)
         ports = fetcher.get(port_id)
 
         if ports:
@@ -133,7 +133,7 @@ class EventSubnetAdd(EventBase):
             # update network
             if not ApiAccess.regions:
                 fetcher = ApiFetchRegions()
-                fetcher.set_env(env)
+                fetcher.setup(env=env, origin=self.origin)
                 fetcher.get(project_id)
 
             self.log.info("add new subnet.")
@@ -146,7 +146,7 @@ class EventSubnetAdd(EventBase):
         FindLinksForVserviceVnics().add_links(search={"parent_id": "qdhcp-%s-vnics" % network_id})
 
         scanner = Scanner()
-        scanner.set_env(env)
+        scanner.setup(env=env, origin=self.origin)
         scanner.scan_cliques()
         self.log.info("Finished subnet added.")
         return EventResult(result=True,
diff --git a/app/discover/events/event_subnet_update.py b/app/discover/events/event_subnet_update.py
index 59b0afb..2c58e70 100644
--- a/app/discover/events/event_subnet_update.py
+++ b/app/discover/events/event_subnet_update.py
@@ -50,7 +50,7 @@ class EventSubnetUpdate(EventBase):
                 # make sure that self.regions is not empty.
                 if not ApiAccess.regions:
                     fetcher = ApiFetchRegions()
-                    fetcher.set_env(env)
+                    fetcher.setup(env=env, origin=self.origin)
                     fetcher.get(project_id)
 
                 self.log.info("add port binding to DHCP server.")
@@ -69,12 +69,12 @@ class EventSubnetUpdate(EventBase):
                     # add link for vservice - vnic
                     FindLinksForVserviceVnics().add_links(search={"id": "qdhcp-%s" % network_id})
                     scanner = Scanner()
-                    scanner.set_env(env)
+                    scanner.setup(env=env, origin=self.origin)
                     scanner.scan_cliques()
                     FindLinksForVserviceVnics(). \
                         add_links(search={"id": "qdhcp-%s" % network_id})
                     scanner = Scanner()
-                    scanner.set_env(env)
+                    scanner.setup(env=env, origin=self.origin)
                     scanner.scan_cliques()
 
             if subnet['enable_dhcp'] is False and subnets[key]['enable_dhcp']: