Commit b566a043 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch... 

Merge branch 'feat/397-tid-e2e-orchestrator-with-pathcomp-for-p2mp-optical-slices' of https://labs.etsi.org/rep/tfs/controller into feat/397-tid-e2e-orchestrator-with-pathcomp-for-p2mp-optical-slices
parents c8fc9fe9 ef80f84f

my_deploy.sh

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ export TFS_COMPONENTS="context device pathcomp service nbi webui" 
#export TFS_COMPONENTS="${TFS_COMPONENTS} forecaster"



# Uncomment to activate E2E Orchestrator

#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"

export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"



# Uncomment to activate VNT Manager

#export TFS_COMPONENTS="${TFS_COMPONENTS} vnt_manager"
@@ -143,7 +143,7 @@ export CRDB_PASSWORD="tfs123" 
export CRDB_DEPLOY_MODE="single"



# Disable flag for dropping database, if it exists.

export CRDB_DROP_DATABASE_IF_EXISTS=""

export CRDB_DROP_DATABASE_IF_EXISTS="YES"



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""
@@ -211,7 +211,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis" 
export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"



# Disable flag for dropping tables if they exist.

export QDB_DROP_TABLES_IF_EXIST=""

export QDB_DROP_TABLES_IF_EXIST="YES"



# Disable flag for re-deploying QuestDB from scratch.

export QDB_REDEPLOY=""

src/device/service/drivers/ietf_l3vpn/IetfL3VpnDriver.py

+10 −9
Original line number Diff line number Diff line
@@ -191,15 +191,16 @@ class IetfL3VpnDriver(_Driver): 
        if len(resources) == 0: return results

        with self.__lock:

            if 'ipowdm' in str(resources):

                for resource in resources:

                    if 'ipowdm' in str(resource):

                        try:

                            create_request(resource)

                            LOGGER.info('Request created successfully')

                            results.append((resource, True))

                        except Exception as e:

                            MSG = 'Invalid resource_value type: expected dict, got {:s}'

                            results.append((resource, e))

                LOGGER.info('Processing IPoWDM resources: {:s}'.format(str(resources)))

                # for resource in resources:

                #     if 'ipowdm' in str(resource):

                #         try:

                #             create_request(resource)

                #             LOGGER.info('Request created successfully')

                #             results.append((resource, True))

                #         except Exception as e:

                #             MSG = 'Invalid resource_value type: expected dict, got {:s}'

                #             results.append((resource, e))

            else:

                for resource in resources:

                    resource_key, resource_value = resource