summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--robotframework-onap/ONAPLibrary/BaseAAIKeywords.py4
-rw-r--r--robotframework-onap/ONAPLibrary/ProtobufKeywords.py16
-rw-r--r--robotframework-onap/ONAPLibrary/VESProtobuf.py4
3 files changed, 16 insertions, 8 deletions
diff --git a/robotframework-onap/ONAPLibrary/BaseAAIKeywords.py b/robotframework-onap/ONAPLibrary/BaseAAIKeywords.py
index 25f36e2..2804e23 100644
--- a/robotframework-onap/ONAPLibrary/BaseAAIKeywords.py
+++ b/robotframework-onap/ONAPLibrary/BaseAAIKeywords.py
@@ -35,9 +35,7 @@ class BaseAAIKeywords(object):
def run_get_request(self, endpoint, data_path, accept="application/json", auth=None):
"""Runs an AAI get request"""
self.http.disable_warnings()
- resp = self.reqs.get_request("aai", endpoint, data_path, sdc_user=None, accept=accept, auth=auth)
- self.builtin.should_be_equal_as_strings(resp.status_code, "200")
- return resp
+ return self.reqs.get_request("aai", endpoint, data_path, sdc_user=None, accept=accept, auth=auth)
@keyword
def run_post_request(self, endpoint, data_path, data, accept="application/json", auth=None):
diff --git a/robotframework-onap/ONAPLibrary/ProtobufKeywords.py b/robotframework-onap/ONAPLibrary/ProtobufKeywords.py
index 3e870d7..0e19cba 100644
--- a/robotframework-onap/ONAPLibrary/ProtobufKeywords.py
+++ b/robotframework-onap/ONAPLibrary/ProtobufKeywords.py
@@ -1,4 +1,18 @@
-from ONAPLibrary.VESProtobuf import *
+# 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.VESProtobuf import VESProtobuf
from ONAPLibrary.JSONKeywords import JSONKeywords
from robot.api.deco import keyword
diff --git a/robotframework-onap/ONAPLibrary/VESProtobuf.py b/robotframework-onap/ONAPLibrary/VESProtobuf.py
index b5a36bc..2bf7f6d 100644
--- a/robotframework-onap/ONAPLibrary/VESProtobuf.py
+++ b/robotframework-onap/ONAPLibrary/VESProtobuf.py
@@ -12,13 +12,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# noinspection PyPackageRequirements
from google.protobuf import descriptor
-# noinspection PyPackageRequirements
from google.protobuf import descriptor_pb2
-# noinspection PyPackageRequirements
from google.protobuf import message_factory
-# noinspection PyPackageRequirements
from google.protobuf.json_format import MessageToJson