remove the last of the SO robot code

Issue-ID: TEST-179
Change-Id: I0b0c223e3c6007cae213b35a77232b05af50ef80
Signed-off-by: DR695H <dr695h@att.com>

diff --git a/robotframework-onap/ONAPLibrary/CloudConfigSOKeywords.py b/robotframework-onap/ONAPLibrary/CloudConfigSOKeywords.py
new file mode 100644 (file)
index 0000000..c40860f
--- /dev/null
+++ b/robotframework-onap/ONAPLibrary/CloudConfigSOKeywords.py
@@ -0,0 +1,54 @@
+# Copyright 2019 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.
+
+from ONAPLibrary.RequestsHelper import RequestsHelper
+from ONAPLibrary.TemplatingKeywords import TemplatingKeywords
+from robot.api.deco import keyword
+from robot.libraries.BuiltIn import BuiltIn
+
+
+class CloudConfigSOKeywords(object):
+    """SO is an ONAP testing library for Robot Framework that provides functionality for interacting with the serivce
+    orchestrator. """
+
+    def __init__(self):
+        super(CloudConfigSOKeywords, self).__init__()
+        self.builtin = BuiltIn()
+        self.reqs = RequestsHelper()
+        self.templating = TemplatingKeywords()
+
+    @keyword
+    def get_cloud_configuration(self, endpoint, data_path, site_name, auth=None):
+        """Gets cloud configuration in SO"""
+        return self.reqs.get_request("so", endpoint, data_path + "/" + site_name, auth=auth)
+
+    @keyword
+    def create_cloud_configuration(self, endpoint, data_path, templates_folder, template, arguments, auth=None):
+        """Creates a cloud configuration in SO, so it knows how to talk to an openstack cloud"""
+        self.templating.create_environment("so", templates_folder)
+        data = self.templating.apply_template("so", template, arguments)
+        resp = self.reqs.post_request("so", endpoint, data_path, data, auth=auth)
+        self.builtin.should_match_regexp(str(resp.status_code), "^(201|200)$")
+
+    @keyword
+    def upsert_cloud_configuration(self, endpoint, data_path, templates_folder, template, arguments, auth=None):
+        """Creates a cloud configuration in SO, or if it exists updates it"""
+        get_resp = self.get_cloud_configuration(endpoint, data_path, arguments['site_name'])
+        self.templating.create_environment("so", templates_folder)
+        data = self.templating.apply_template("so", template, arguments)
+        if get_resp.status_code == 404:
+            resp = self.reqs.post_request("so", endpoint, data_path, data, auth=auth)
+        else:
+            resp = self.reqs.put_request("so", endpoint, data_path, data, auth=auth)
+        self.builtin.should_match_regexp(str(resp.status_code), "^(201|200)$")

diff --git a/robotframework-onap/ONAPLibrary/RequestSOKeywords.py b/robotframework-onap/ONAPLibrary/RequestSOKeywords.py
index 36642ae..92658db 100644 (file)
--- a/robotframework-onap/ONAPLibrary/RequestSOKeywords.py
+++ b/robotframework-onap/ONAPLibrary/RequestSOKeywords.py
@@ -24,7 +24,6 @@ class RequestSOKeywords(object):
 
     def __init__(self):
         super(RequestSOKeywords, self).__init__()
-        self.application_id = "robot-ete"
         self.builtin = BuiltIn()
         self.reqs = RequestsHelper()
 

diff --git a/robotframework-onap/ONAPLibrary/SO.py b/robotframework-onap/ONAPLibrary/SO.py
index 2454e97..3d2cbc3 100644 (file)
--- a/robotframework-onap/ONAPLibrary/SO.py
+++ b/robotframework-onap/ONAPLibrary/SO.py
@@ -15,6 +15,7 @@
 from ONAPLibrary.RequestSOKeywords import RequestSOKeywords
 from ONAPLibrary.robotlibcore import HybridCore
 from ONAPLibrary.BaseSOKeywords import BaseSOKeywords
+from ONAPLibrary.CloudConfigSOKeywords import CloudConfigSOKeywords
 
 
 class SO(HybridCore):
@@ -26,6 +27,7 @@ class SO(HybridCore):
     def __init__(self):
         self.keyword_implementors = [
             BaseSOKeywords(),
-            RequestSOKeywords()
+            RequestSOKeywords(),
+            CloudConfigSOKeywords()
         ]
         HybridCore.__init__(self, self.keyword_implementors)

diff --git a/robotframework-onap/ONAPLibrary/UUIDKeywords.py b/robotframework-onap/ONAPLibrary/UUIDKeywords.py
index ae92637..add844c 100644 (file)
--- a/robotframework-onap/ONAPLibrary/UUIDKeywords.py
+++ b/robotframework-onap/ONAPLibrary/UUIDKeywords.py
@@ -1,3 +1,17 @@
+# Copyright 2019 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.
+
 import uuid
 import time
 import datetime

diff --git a/robotframework-onap/ONAPLibrary/Utilities.py b/robotframework-onap/ONAPLibrary/Utilities.py
index 5751e21..4773432 100644 (file)
--- a/robotframework-onap/ONAPLibrary/Utilities.py
+++ b/robotframework-onap/ONAPLibrary/Utilities.py
@@ -18,6 +18,7 @@ from ONAPLibrary.SocketKeywords import SocketKeywords
 from ONAPLibrary.UUIDKeywords import UUIDKeywords
 from ONAPLibrary.HTTPKeywords import HTTPKeywords
 from ONAPLibrary.Base64Keywords import Base64Keywords
+from ONAPLibrary.VariableKeywords import VariableKeywords
 
 
 class Utilities(HybridCore):
@@ -31,6 +32,7 @@ class Utilities(HybridCore):
             SocketKeywords(),
             UUIDKeywords(),
             HTTPKeywords(),
-            Base64Keywords()
+            Base64Keywords(),
+            VariableKeywords()
         ]
         HybridCore.__init__(self, self.keyword_implementors)

diff --git a/robotframework-onap/ONAPLibrary/VariableKeywords.py b/robotframework-onap/ONAPLibrary/VariableKeywords.py
new file mode 100644 (file)
index 0000000..7b659c2
--- /dev/null
+++ b/robotframework-onap/ONAPLibrary/VariableKeywords.py
@@ -0,0 +1,37 @@
+# Copyright 2019 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.
+
+from robot.api.deco import keyword
+from robot.libraries.BuiltIn import BuiltIn
+
+
+class VariableKeywords(object):
+    """ Utilities useful for working with varaibles """
+
+    def __init__(self):
+        super(VariableKeywords, self).__init__()
+        self.builtin = BuiltIn()
+
+    @keyword
+    def get_globally_injected_parameters(self):
+        dictionary = self.builtin.get_variables(no_decoration=True)
+        return self.filter_variables_by_key_prefix(dictionary, "GLOBAL_INJECTED")
+
+    @keyword
+    def filter_variables_by_key_prefix(self, dictionary, partial):
+        matches = dict()
+        for key, val in dictionary.items():
+            if key.startswith(partial):
+                matches[key] = val
+        return matches