Removing files used in the pipeline

diff --git a/src/MockServerLibrary/library.py b/src/MockServerLibrary/library.py

index a9e6227..7208e61 100644

--- a/src/MockServerLibrary/library.py

+++ b/src/MockServerLibrary/library.py

@@ -68,6 +68,31 @@ class MockServerLibrary(object):

         return req

+    def create_mock_request_matcher_schema(self, method, path, body_type='JSON_SCHEMA', body=None):

+        """Creates a mock request matcher to be used by mockserver.

+

+        Returns the request matcher in a dictionary format.

+

+        `method` is the HTTP method of the mocked endpoint

+

+        `path` is the url of the mocked endpoint, e.g. /api

+

+        `body_type` is the type of the request body, e.g. JSON

+

+        `body` is a dictionary of the json attribute(s) to match

+

+        `exact` is a boolean value which specifies whether the body should match fully (=true),

+        or if only specified fields should match (=false)

+        """

+        req = {}

+        req['method'] = method

+        req['path'] = path

+

+        req['body'] = {'type': body_type, 'jsonSchema': json.dumps(body)}

+

+        return req	

+		

+		

     def create_mock_response(self, status_code, headers=None, body_type='JSON', body=None):

         """Creates a mock response to be used by mockserver.

@@ -97,6 +122,37 @@ class MockServerLibrary(object):

         return rsp

+		

+    def create_mock_response_schema(self, status_code, headers=None, body_type='JSON_SCHEMA', body=None):

+        """Creates a mock response to be used by mockserver.

+

+        Returns the response in a dictionary format.

+

+        `status_code` is the HTTP status code of the response

+

+        `headers` is a dictionary of headers to be added to the response

+

+        `body_type` is the type of the response body, e.g. JSON

+

+        `body` is a dictonary of JSON attribute(s) to be added to the response body

+        """

+        rsp = {}

+        rsp['statusCode'] = int(status_code)

+

+        if headers:

+            rsp['headers'] = []

+

+            for key, value in headers.items():

+                header = {'name': key, 'values': value.split(",")}

+                rsp['headers'].append(header)

+                logger.debug("Add header - header: {}".format(header))

+

+        if body_type is 'JSON_SCHEMA' and body:

+            rsp['body'] = json.dumps(body)

+

+        return rsp

+

+

     def create_mock_expectation(self, request, response, count=1, unlimited=True):

         """Creates a mock expectation to be used by mockserver.

diff --git a/JSONLibrary/JSONLibraryKeywords.py b/JSONLibrary/JSONLibraryKeywords.py

index 6ceb6e1..20bfd45 100644

--- a/JSONLibrary/JSONLibraryKeywords.py

+++ b/JSONLibrary/JSONLibraryKeywords.py

@@ -1,7 +1,13 @@

 # -*- coding: utf-8 -*-

 from robot.api import logger

 from robot.api.deco import keyword

-from version import VERSION

+#from version import VERSION

+try:

+    from version import VERSION

+except:

+    from JSONLibrary.version import VERSION

+

+

 import os.path

 import json

 from jsonpath_rw import Index, Fields

diff --git a/JSONLibrary/__init__.py b/JSONLibrary/__init__.py

index efc756e..79ad728 100644

--- a/JSONLibrary/__init__.py

+++ b/JSONLibrary/__init__.py

@@ -1,6 +1,12 @@

 # -*- coding: utf-8 -*-

-from JSONLibraryKeywords import JSONLibraryKeywords

-from version import VERSION

+# from JSONLibraryKeywords import JSONLibraryKeywords

+# from version import VERSION

+try:

+    from JSONLibraryKeywords import JSONLibraryKeywords

+    from version import VERSION

+except:

+    from JSONLibrary.JSONLibraryKeywords import JSONLibraryKeywords

+    from JSONLibrary.version import VERSION

 __author__ = 'Traitanit Huangsri'

 __email__ = 'traitanit.hua@gmail.com'

diff --git a/setup.py b/setup.py

index 744e6f5..5082364 100644

--- a/setup.py

+++ b/setup.py

@@ -2,7 +2,15 @@

 # -*- coding: utf-8 -*-

 from setuptools import setup

-from JSONLibrary.version import VERSION

+# from JSONLibrary.version import VERSION

+

+

+# importing this has the unwanted side-effect of importing

+# other required packages that may not be installed yet

+# resulting in an error

+#from JSONLibrary.version import VERSION

+

+VERSION = '0.2'

 requirements = [

     'tox',

diff --git a/src/MockServerLibrary/library.py b/src/MockServerLibrary/library.py

index a9e6227..7ba1eed 100644

--- a/src/MockServerLibrary/library.py

+++ b/src/MockServerLibrary/library.py

@@ -66,6 +66,9 @@ class MockServerLibrary(object):

             match_type = 'STRICT' if exact else 'ONLY_MATCHING_FIELDS'

             req['body'] = {'type': body_type, 'json': json.dumps(body), 'matchType': match_type}

+        if body_type is 'JSON_SCHEMA' and body:

+            req['body'] = {'type': body_type, 'json': json.dumps(body)}

+

         return req

     def create_mock_response(self, status_code, headers=None, body_type='JSON', body=None):

@@ -97,6 +100,42 @@ class MockServerLibrary(object):

         return rsp

+    def create_mock_http_forward(self, path, delay=1, unit='SECONDS'):

+        """Creates a mock http override forward to be used by mockserver.

+

+        Returns the http forward in a dictionary format.

+

+        `path` is the new url where to forward the request

+

+        `delay` is the delay of the forward action

+

+        `unit` is the unit of the delay time (default "SECONDS")

+        """

+        fwd = {}

+        fwd['httpRequest'] = {'path': path}

+        fwd['delay'] = {'timeUnit': unit, 'value': delay}

+

+        return fwd

+

+    def create_mock_expectation_with_http_forward(self, request, forward, count=1, unlimited=True):

+        """Creates a mock expectation with request and forward action to be used by mockserver.

+

+        `request` is a mock request matcher in a dictionary format.

+

+        `forward` is a mock forward in a dictionary format.

+

+        `count` is the number of expected requests

+

+        `unlimited` is a boolean value which, if enabled, allows unspecified number of

+        requests to reply to

+        """

+        data = {}

+        data['httpRequest'] = request

+        data['httpOverrideForwardedRequest'] = forward

+        data['times'] = {'remainingTimes': int(count), 'unlimited': unlimited}

+

+        self.create_mock_expectation_with_data(data)

+

     def create_mock_expectation(self, request, response, count=1, unlimited=True):

         """Creates a mock expectation to be used by mockserver.

## To install the libraries, use:

# pip -r requirements.txt

git+https://github.com/etsi-cti-admin/RESTinstance

robotframework==3.1

#RESTinstance==1.0.0rc4

robotframework-dependencylibrary==1.0.0.post1

robotframework-jsonlibrary==0.3

robotframework-jsonschemalibrary==1.0

robotframework-mockserver==0.0.7

robotframework-requests==0.7.1

#!/bin/bash

# Copyright ETSI 2019

# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt

#set -e

set -vx

DOCKER_FILE=./scripts/docker/Dockerfile

if [ -f ${DOCKER_FILE} ]

then

    #check and build stf583-rf-validation image

    DOCKER_ID=`docker ps -a | grep -e stf583-rf-validation | awk '{ print $1 }'`

#    if [ ! -z "${DOCKER_ID}" ]

#    then

#        docker rm --force stf583-rf-validation

#    fi

    docker build --tag stf583-rf-validation -f ${DOCKER_FILE} .

    if [ "$?" != "0" ]

    then

        echo "Docker build failed: $?"

        exit -1

    fi

#    docker image ls -a

#    docker inspect stf583-rf-validation:latest

#    if [ "$?" != "0" ]

#    then

#        echo "Docker inspect failed: $?"

#        exit -2

#    fi

#else

#    exit -3

fi

# That's all Floks

exit 0