Commit 0f73c68c authored by Pablo Armingol's avatar Pablo Armingol
Browse files

feat: improve .env initialization and expand L3IPoWDM slice node data structures

parent b694d9e5

deploy.sh

+8 −3
Original line number Diff line number Diff line
@@ -43,9 +43,14 @@ if [ ! -f src/config/.env.example ]; then 
    exit 1

fi



# Copy .env.example to .env

echo "Generating .env file..."

# Copy .env if not exists

if [ -f src/config/.env ]; then

    echo "Using existing src/config/.env file..."

    cp src/config/.env .env

else

    echo "Generating .env file from example..."

    cp src/config/.env.example .env

fi



# Read NSC_PORT from .env

NSC_PORT=$(grep '^NSC_PORT=' .env | cut -d '=' -f2)

src/realizer/e2e/service_types/l3ipowdm_slice.py

+12 −2
Original line number Diff line number Diff line
@@ -93,12 +93,22 @@ def l3ipowdm_slice(rules): 
        elif rule["type"] == "CONFIG_VPNL3":

            service_uuid = rule["content"]["tunnel-uuid"]



            src = [rule["content"]["src-node-uuid"]]

            src = [{

                'uuid': rule["content"]["src-node-uuid"],

                'ip_address': rule["content"]["src-ip-address"],

                'ip_mask': rule["content"]["src-ip-mask"],

                'vlan_id': rule["content"]["src-vlan-id"]

            }]



            dst = []

            i = 1

            while f"dest{i}-node-uuid" in rule["content"]:

                dst.append(rule["content"][f"dest{i}-node-uuid"])

                dst.append({

                    'uuid': rule["content"][f"dest{i}-node-uuid"],

                    'ip_address': rule["content"][f"dest{i}-ip-address"],

                    'ip_mask': rule["content"][f"dest{i}-ip-mask"],

                    'vlan_id': rule["content"][f"dest{i}-vlan-id"]

                })

                i += 1



            tfs_request = load_template(os.path.join(TEMPLATES_PATH, "IPoWDM_orchestrator.json"))