Update INFO.yaml with new PTL

[testsuite/python-testing-utils.git] / robotframework-onap / ONAPLibrary / MUSICKeywords.py

diff --git a/robotframework-onap/ONAPLibrary/MUSICKeywords.py b/robotframework-onap/ONAPLibrary/MUSICKeywords.py
index abceb54..2a9364a 100644 (file)
--- a/robotframework-onap/ONAPLibrary/MUSICKeywords.py
+++ b/robotframework-onap/ONAPLibrary/MUSICKeywords.py
@@ -11,12 +11,11 @@
 # 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 RequestsLibrary import RequestsLibrary
-from robot.api import logger
+
 from robot.api.deco import keyword
 from robot.libraries.BuiltIn import BuiltIn
 
-from ONAPLibrary.Utilities import Utilities
+from ONAPLibrary.RequestsHelper import RequestsHelper
 
 
 class MUSICKeywords(object):
@@ -25,34 +24,13 @@ class MUSICKeywords(object):
 
     def __init__(self):
         super(MUSICKeywords, self).__init__()
-        self.application_id = "robot-ete"
-        self.uuid = Utilities()
+        self.reqs = RequestsHelper()
         self.builtin = BuiltIn()
 
     @keyword
     def run_get_request(self, endpoint, data_path, accept="application/json", auth=None):
         """Runs an MUSIC get request"""
-        resp = self.get_request(endpoint, data_path, accept, auth)
-        return resp
-
-    def get_request(self, endpoint, data_path, accept="application/json", auth=None):
-        """Runs an MUSIC get request"""
-        logger.info("Creating session" + endpoint)
-        RequestsLibrary().create_session("music", endpoint, auth=auth)
-        resp = RequestsLibrary().get_request("music", data_path, headers=self.create_headers(accept))
-        logger.info("Received response from music " + resp.text)
-        return resp
-
-    def create_headers(self, accept="application/json"):
-        """Create the headers that are used by MUSIC"""
-        uuid = self.uuid.generate_uuid4()
-        headers = {
-            "Accept": accept,
-            "Content-Type": "application/json",
-            "X-TransactionId": self.application_id + "-" + uuid,
-            "X-FromAppId": self.application_id
-        }
-        return headers
+        return self.reqs.get_request(alias="music", endpoint=endpoint, data_path=data_path, accept=accept, auth=auth)
 
     def run_health_check(self, endpoint, health_check_path):
         """Runs MUSIC Health check"""
@@ -65,4 +43,3 @@ class MUSICKeywords(object):
         resp = self.run_get_request(endpoint, health_check_path)
         self.builtin.should_be_equal_as_strings(resp.status_code, "200")
         self.builtin.should_be_equal_as_strings(resp.json()['Cassandra'], "Active")
-