Commit 78ab48ab authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

pre-merge clean-up

parent b0e817d5

src/nbi/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -93,10 +93,10 @@ COPY src/slice/__init__.py slice/__init__.py 
COPY src/slice/client/. slice/client/

COPY src/vnt_manager/__init__.py vnt_manager/__init__.py

COPY src/vnt_manager/client/. vnt_manager/client/

RUN mkdir -p /var/teraflow/tests/tools

COPY src/tests/tools/mock_osm/. tests/tools/mock_osm/

COPY src/ztp_server/__init__.py ztp_server/__init__.py

COPY src/ztp_server/client/. ztp_server/client/

RUN mkdir -p /var/teraflow/tests/tools

COPY src/tests/tools/mock_osm/. tests/tools/mock_osm/





# Start the service

src/nbi/service/app.py

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ from .tfs_api import register_tfs_api 
#from .topology_updates import register_topology_updates

from .vntm_recommend import register_vntm_recommend

from .well_known_meta import register_well_known

from .ztp_nbi import register_ztp_api

from .ztp_api import register_ztp_api



LOG_LEVEL = get_log_level()

logging.basicConfig(

src/nbi/service/ztp_nbi/Resources.py→src/nbi/service/ztp_api/Resources.py

+6 −11
Original line number Diff line number Diff line
@@ -27,15 +27,8 @@ ZTP_HTTP_BASE = os.getenv("ZTP_SERVER_HTTP_BASE", "http://ztp-serverservice:8005 
ZTP_HTTP_USER = os.getenv("ZTP_SERVER_HTTP_USER", "admin")

ZTP_HTTP_PASS = os.getenv("ZTP_SERVER_HTTP_PASS", "admin")



# gRPC to ztp-server (for script)

ZTP_GRPC_HOST = os.getenv("ZTP_SERVER_GRPC_HOST", "ztp-serverservice")

ZTP_GRPC_PORT = os.getenv("ZTP_SERVER_GRPC_PORT", "5051")



class _Resource(Resource):

    def __init__(self) -> None:

        super().__init__()



class ZtpProvisioning(_Resource):

class ZtpProvisioning(Resource):

    def get(self, filename: str):

        url = f"{ZTP_HTTP_BASE}/provisioning/{filename}"

        r = requests.get(url, auth=(ZTP_HTTP_USER, ZTP_HTTP_PASS), timeout=10)
@@ -45,11 +38,13 @@ class ZtpProvisioning(_Resource): 
            mimetype=r.headers.get("Content-Type", "application/json"),

        )



class ZtpScript(_Resource):

class ZtpScript(Resource):

    def __init__(self) -> None:

        super().__init__()

        self.ztp_client = ZtpClient(host=ZTP_GRPC_HOST, port=ZTP_GRPC_PORT)

        self.ztp_client = ZtpClient()



    def get(self, scriptname: str):

        resp = self.ztp_client.GetProvisioningScript(ProvisioningScriptName(scriptname=scriptname))

        resp = self.ztp_client.GetProvisioningScript(

            ProvisioningScriptName(scriptname=scriptname)

        )

        return Response(resp.script, mimetype="text/plain")