Resolve "Merge Hackfest 5 in `develop` and related code fixes"

Closes #231 (closed)

Merge request reports

Loading
+1 −2
Changes for deploy/nats.sh: 1 added line, 2 removed lines.
Original line number Diff line number Diff line
@@ -69,8 +69,7 @@ function nats_deploy_single() {
        echo ">>> NATS is present; skipping step."
    else
        echo ">>> Deploy NATS"
        helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine --set config.cluster.enabled=true --set config.cluster.tls.enabled=true

        helm3 install ${NATS_NAMESPACE} nats/nats --namespace ${NATS_NAMESPACE} --set nats.image=nats:2.9-alpine

        echo ">>> Waiting NATS statefulset to be created..."
        while ! kubectl get --namespace ${NATS_NAMESPACE} statefulset/${NATS_NAMESPACE} &> /dev/null; do
+1 −1
Changes for deploy/tfs.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type=
    --from-literal=CRDB_SSLMODE=require
printf "\n"

echo ">>> Create Secret with Apache Kakfa..."
echo ">>> Create Secret with Apache Kafka..."
KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')
kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \
    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
+83 −0
Changes for hackfest5/data/ietf-l3vpn-service.json: 83 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
    "ietf-l3vpn-svc:l3vpn-svc": {
        "vpn-services": {"vpn-service": [{"vpn-id": "ietf-l3vpn-svc"}]},
        "sites": {
            "site": [
                {
                    "site-id": "site_DC1",
                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
                    "locations": {"location": [{"location-id": "DC1"}]},
                    "devices": {"device": [{"device-id": "dc1", "location": "DC1"}]},
                    "site-network-accesses": {
                        "site-network-access": [
                            {
                                "site-network-access-id": "eth1",
                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
                                "device-reference": "dc1",
                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:spoke-role"},
                                "ip-connection": {
                                    "ipv4": {
                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
                                        "addresses": {
                                            "provider-address": "192.168.1.1",
                                            "customer-address": "192.168.1.10",
                                            "prefix-length": 24
                                        }
                                    }
                                },
                                "service": {
                                    "svc-mtu": 1500,
                                    "svc-input-bandwidth": 1000000000,
                                    "svc-output-bandwidth": 1000000000,
                                    "qos": {"qos-profile": {"classes": {"class": [{
                                        "class-id": "qos-realtime",
                                        "direction": "ietf-l3vpn-svc:both",
                                        "latency": {"latency-boundary": 10},
                                        "bandwidth": {"guaranteed-bw-percent": 100}
                                    }]}}}
                                }
                            }
                        ]
                    }
                },
                {
                    "site-id": "site_DC2",
                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
                    "locations": {"location": [{"location-id": "DC2"}]},
                    "devices": {"device": [{"device-id": "dc2", "location": "DC2"}]},
                    "site-network-accesses": {
                        "site-network-access": [
                            {
                                "site-network-access-id": "eth1",
                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
                                "device-reference": "dc2",
                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:hub-role"},
                                "ip-connection": {
                                    "ipv4": {
                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
                                        "addresses": {
                                            "provider-address": "192.168.2.1",
                                            "customer-address": "192.168.2.10",
                                            "prefix-length": 24
                                        }
                                    }
                                },
                                "service": {
                                    "svc-mtu": 1500,
                                    "svc-input-bandwidth": 1000000000,
                                    "svc-output-bandwidth": 1000000000,
                                    "qos": {"qos-profile": {"classes": {"class": [{
                                        "class-id": "qos-realtime",
                                        "direction": "ietf-l3vpn-svc:both",
                                        "latency": {"latency-boundary": 10},
                                        "bandwidth": {"guaranteed-bw-percent": 100}
                                    }]}}}
                                }
                            }
                        ]
                    }
                }
            ]
        }
    }
}
+26 −0
Changes for hackfest5/data/tfs-service.json: 26 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
    "services": [
        {
            "service_id": {
                "context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "tfs-l3vpn-svc"}
            },
            "service_type": "SERVICETYPE_L3NM",
            "service_status": {"service_status": "SERVICESTATUS_PLANNED"},
            "service_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "int"}},
                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "int"}}
            ],
            "service_constraints": [],
            "service_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {
                    "resource_key": "/device[dc1]/endpoint[eth1]/settings",
                    "resource_value": {"address_ip": "192.168.1.10", "address_prefix": 24, "index": 0}
                }},
                {"action": "CONFIGACTION_SET", "custom": {
                    "resource_key": "/device[dc2]/endpoint[eth1]/settings",
                    "resource_value": {"address_ip": "192.168.2.10", "address_prefix": 24, "index": 0}
                }}
            ]}
        }
    ]
}
+100 −0
Changes for hackfest5/data/tfs-topology.json: 100 added lines, 0 removed lines.
Original line number Diff line number Diff line
{
    "contexts": [
        {"context_id": {"context_uuid": {"uuid": "admin"}}}
    ],
    "topologies": [
        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
    ],
    "devices": [
        {
            "device_id": {"device_uuid": {"uuid": "dc1"}}, "device_type": "emu-datacenter",
            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],
            "device_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
                    {"uuid": "eth1", "type": "copper"}, {"uuid": "int", "type": "copper"}
                ]}}}
            ]}
        },
        {
            "device_id": {"device_uuid": {"uuid": "dc2"}}, "device_type": "emu-datacenter",
            "device_drivers": ["DEVICEDRIVER_UNDEFINED"],
            "device_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
                    {"uuid": "eth1", "type": "copper"}, {"uuid": "int", "type": "copper"}
                ]}}}
            ]}
        },
        {
            "device_id": {"device_uuid": {"uuid": "r1"}}, "device_type": "packet-router",
            "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
            "device_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.101"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin", "use_tls": false
                }}}
            ]}
        },
        {
            "device_id": {"device_uuid": {"uuid": "r2"}}, "device_type": "packet-router",
            "device_drivers": ["DEVICEDRIVER_GNMI_OPENCONFIG"],
            "device_config": {"config_rules": [
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/address", "resource_value": "172.20.20.102"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/port", "resource_value": "6030"}},
                {"action": "CONFIGACTION_SET", "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin", "use_tls": false
                }}}
            ]}
        }
    ],
    "links": [
        {
            "link_id": {"link_uuid": {"uuid": "r1/Ethernet2==r2/Ethernet1"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet2"}},
                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}}
            ]
        },
        {
            "link_id": {"link_uuid": {"uuid": "r2/Ethernet1==r1/Ethernet2"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet1"}},
                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet2"}}
            ]
        },

        {
            "link_id": {"link_uuid": {"uuid": "r1/Ethernet10==dc1/eth1"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}}
            ]
        },
        {
            "link_id": {"link_uuid": {"uuid": "dc1/eth1==r1/Ethernet10"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "dc1"}}, "endpoint_uuid": {"uuid": "eth1"}},
                {"device_id": {"device_uuid": {"uuid": "r1"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
            ]
        },

        {
            "link_id": {"link_uuid": {"uuid": "r2/Ethernet10==dc2/eth1"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}},
                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}}
            ]
        },
        {
            "link_id": {"link_uuid": {"uuid": "dc2/eth1==r2/Ethernet10"}},
            "link_endpoint_ids": [
                {"device_id": {"device_uuid": {"uuid": "dc2"}}, "endpoint_uuid": {"uuid": "eth1"}},
                {"device_id": {"device_uuid": {"uuid": "r2"}}, "endpoint_uuid": {"uuid": "Ethernet10"}}
            ]
        }
    ]
}
Loading
Loading