Commit ce1cd520 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

NBI - IETF ACL connector: 

- Improved test client
- Added debug log messages
- Code cleanup
- Added dump of configured resources and rules while NBI starts
parent 772c7528

src/nbi/service/__main__.py

+8 −0
Original line number Diff line number Diff line
@@ -75,6 +75,14 @@ def main(): 
    register_tfs_api(rest_server)

    rest_server.start()



    LOGGER.debug('Configured Resources:')

    for resource in rest_server.api.resources:

        LOGGER.debug(' - {:s}'.format(str(resource)))



    LOGGER.debug('Configured Rules:')

    for rule in rest_server.app.url_map.iter_rules():

        LOGGER.debug(' - {:s}'.format(str(rule)))



    # Wait for Ctrl+C or termination signal

    while not terminate.wait(timeout=1.0): pass

src/nbi/service/rest_server/nbi_plugins/ietf_acl/__init__.py

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ def register_ietf_acl(rest_server: RestServer): 
        rest_server,

        ACLs,

        "/device=<path:device_uuid>/ietf-access-control-list:acls",

        "/device=<path:device_uuid>/ietf-access-control-list:acls",

    )



    __add_resource(

src/nbi/service/rest_server/nbi_plugins/ietf_acl/acl_service.py

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ ACL_CONIG_RULE_KEY = r'\/device\[.+\]\/endpoint\[(.+)\]/acl_ruleset\[{}\]' 
class ACL(Resource):

    # @HTTP_AUTH.login_required

    def get(self, device_uuid: str, acl_name: str):

        LOGGER.debug("GET device_uuid={:s}, acl_name={:s}".format(str(device_uuid), str(acl_name)))

        RE_ACL_CONIG_RULE_KEY = re.compile(ACL_CONIG_RULE_KEY.format(acl_name))



        context_client = ContextClient()
@@ -63,6 +64,7 @@ class ACL(Resource): 


    # @HTTP_AUTH.login_required

    def delete(self, device_uuid: str, acl_name: str):

        LOGGER.debug("DELETE device_uuid={:s}, acl_name={:s}".format(str(device_uuid), str(acl_name)))

        RE_ACL_CONIG_RULE_KEY = re.compile(ACL_CONIG_RULE_KEY.format(acl_name))



        context_client = ContextClient()

src/nbi/service/rest_server/nbi_plugins/ietf_acl/acl_services.py

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ class ACLs(Resource): 


    # @HTTP_AUTH.login_required

    def post(self, device_uuid: str):

        LOGGER.debug("POST device_uuid={:s}, body={:s}".format(str(device_uuid), str(request.data)))

        if not request.is_json:

            raise UnsupportedMediaType("JSON pyload is required")

        request_data: Dict = request.json

src/nbi/service/rest_server/nbi_plugins/ietf_acl/ietf_acl_client.py

+41 −42
Original line number Diff line number Diff line
@@ -12,58 +12,57 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import requests

import json

import time

import json, requests, time

from typing import Optional

from requests.auth import HTTPBasicAuth



BASE_URL = "/restconf/data"

POST_URL = "/device={}/ietf-access-control-list:acls"

DELETE_URL = "/device={}/ietf-access-control-list:acl={}"

BASE_URL = '{:s}://{:s}:{:d}/restconf/data'

ACLS_URL = '{:s}/device={:s}/ietf-access-control-list:acls'

ACL_URL  = '{:s}/device={:s}/ietf-access-control-list:acl={:s}'



class IetfTfsClient:

    def __init__(self,

                 tfs_host: str = "10.1.1.119",

                 tfs_port: int = 80,

                 username: str = "admin",

                 password: str = "admin",

                 timeout: int = 10,

                 allow_redirects: bool = True,

class TfsIetfAclClient:

    def __init__(

        self, host : str = 'localhost', port : int = 80, schema : str = 'http',

        username : Optional[str] = 'admin', password : Optional[str] = 'admin',

        timeout : int = 10, allow_redirects : bool = True, verify : bool = False

    ) -> None:

        self.host = tfs_host

        self.port = tfs_port

        self.username = username

        self.password = password

        self.timeout = timeout

        self.allow_redirects = allow_redirects

        self._base_url = BASE_URL.format(schema, host, port)

        auth = HTTPBasicAuth(username, password) if username is not None and password is not None else None

        self._settings = dict(auth=auth, timeout=timeout, allow_redirects=allow_redirects, verify=verify)



    def post(self, device_uuid : str, ietf_acl_data : dict) -> str:

        request_url = "http://{:s}:{:d}{:s}{:s}".format(self.host, self.port, BASE_URL, POST_URL.format(device_uuid))

        reply = requests.request("post", request_url, timeout=self.timeout, json=ietf_acl_data, allow_redirects=self.allow_redirects)

        request_url = ACLS_URL.format(self._base_url, device_uuid)

        reply = requests.post(request_url, json=ietf_acl_data, **(self._settings))

        return reply.text



    def get(self, device_uuid : str, acl_name : str) -> str:

        request_url = "http://{:s}:{:d}{:s}{:s}".format(self.host, self.port, BASE_URL, DELETE_URL.format(device_uuid, acl_name))

        reply = requests.request("get", request_url, timeout=self.timeout, allow_redirects=self.allow_redirects)

        request_url = ACL_URL.format(self._base_url, device_uuid, acl_name)

        reply = requests.get(request_url, **(self._settings))

        return reply.text



    def delete(self, device_uuid : str, acl_name : str) -> str:

        request_url = "http://{:s}:{:d}{:s}{:s}".format(self.host, self.port, BASE_URL, DELETE_URL.format(device_uuid, acl_name))

        reply = requests.request("delete", request_url, timeout=self.timeout, allow_redirects=self.allow_redirects)

        request_url = ACL_URL.format(self._base_url, device_uuid, acl_name)

        reply = requests.delete(request_url, **(self._settings))

        return reply.text



if __name__ == "__main__":

    csg1_device_uuid = 'b71fd62f-e3d4-5956-93b9-3139094836cf'

def main():

    csg1_device_uuid = '0392c251-b5d3-526b-8f3b-a3d4137829fa'

    acl_name = 'sample-ipv4-acl'

    acl_request_path = 'src/nbi/tests/data/ietf_acl.json'

    with open(acl_request_path, 'r') as afile:

        acl_request_data = json.load(afile)



    ietf_tfs_client = IetfTfsClient()

    post_response = ietf_tfs_client.post(csg1_device_uuid, acl_request_data)

    print(f"post response: {post_response}")

    with open(acl_request_path, 'r', encoding='UTF-8') as f:

        acl_request_data = json.load(f)

        print(acl_request_data)



    client = TfsIetfAclClient()

    post_response = client.post(csg1_device_uuid, acl_request_data)

    print(f'post response: {post_response}')

    time.sleep(.5)

    get_response = ietf_tfs_client.get(csg1_device_uuid, acl_name)

    print(f"get response: {get_response}")

    get_response = client.get(csg1_device_uuid, acl_name)

    print(f'get response: {get_response}')

    time.sleep(.5)

    delete_response = ietf_tfs_client.delete(csg1_device_uuid, acl_name)

    print(f"delete response: {delete_response}")
 
 No newline at end of file
 
    delete_response = client.delete(csg1_device_uuid, acl_name)

    print(f'delete response: {delete_response}')



if __name__ == '__main__':

    main()