From 648a394f7a318443dfd82f790f83a79616c26905 Mon Sep 17 00:00:00 2001
From: yayogev <yaronyogev@gmail.com>
Date: Tue, 27 Feb 2018 17:00:05 +0200
Subject: 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>
---
 app/discover/fetcher.py | 51 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

(limited to 'app/discover/fetcher.py')

diff --git a/app/discover/fetcher.py b/app/discover/fetcher.py
index 8d7fdbb..707cd60 100644
--- a/app/discover/fetcher.py
+++ b/app/discover/fetcher.py
@@ -8,16 +8,21 @@
 # http://www.apache.org/licenses/LICENSE-2.0                                  #
 ###############################################################################
 from discover.configuration import Configuration
+from utils.origins import Origin
 from utils.logging.full_logger import FullLogger
 
 
 class Fetcher:
 
+    ENV_TYPE_KUBERNETES = 'Kubernetes'
+    ENV_TYPE_OPENSTACK = 'OpenStack'
+
     def __init__(self):
         super().__init__()
         self.env = None
         self.log = FullLogger()
         self.configuration = None
+        self.origin = None
 
     @staticmethod
     def escape(string):
@@ -25,11 +30,55 @@ class Fetcher:
 
     def set_env(self, env):
         self.env = env
-        self.log.set_env(env)
+        self.log.setup(env=env)
         self.configuration = Configuration()
 
+    def setup(self, env, origin: Origin = None):
+        self.set_env(env=env)
+        if origin:
+            self.origin = origin
+            self.log.setup(origin=origin)
+
     def get_env(self):
         return self.env
 
     def get(self, object_id):
         return None
+
+    def set_folder_parent(self,
+                          o: dict,
+                          object_type: str =None,
+                          master_parent_type: str =None,
+                          master_parent_id: str =None,
+                          parent_objects_name=None,
+                          parent_type: str =None,
+                          parent_id: str =None,
+                          parent_text: str =None):
+        if object_type:
+            o['type'] = object_type
+            if not parent_objects_name:
+                parent_objects_name = '{}s'.format(object_type)
+        if not master_parent_type:
+            self.log.error('set_folder_parent: must specify: '
+                           'master_parent_type, master_parent_id, '
+                           'parent_type', 'parent_id')
+            return
+        if not parent_objects_name and not parent_type:
+            self.log.error('set_folder_parent: must specify: '
+                           'either parent_objects_name (e.g. "vedges") '
+                           'or parent_type and parent_id')
+            return
+        if parent_objects_name and not parent_type:
+            parent_type = '{}_folder'.format(parent_objects_name)
+        if parent_objects_name and not parent_id:
+            parent_id = '{}-{}'.format(master_parent_id, parent_objects_name)
+        o.update({
+            'master_parent_type': master_parent_type,
+            'master_parent_id': master_parent_id,
+            'parent_type': parent_type,
+            'parent_id': parent_id
+        })
+        if parent_text:
+            o['parent_text'] = parent_text
+        elif parent_objects_name:
+            o['parent_text'] = parent_objects_name.capitalize()
-- 
cgit 1.2.3-korg