Commit b374a6fd authored by Carlos Manso's avatar Carlos Manso
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers
parents 3a6026cc 2d23b59d

deploy/crdb.sh

+2 −10
Original line number Diff line number Diff line
@@ -153,16 +153,8 @@ function crdb_undeploy_single() { 
function crdb_drop_databases_single() {

    echo "Drop TFS databases, if exist"



    if [[ -z "${GITLAB_CI}" ]]; then

        #kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o yaml

        CRDB_HOST=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.clusterIP}')

    CRDB_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

    else

        CRDB_HOST="127.0.0.1"

        CRDB_PORT=${CRDB_EXT_PORT_SQL}

    fi



    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@${CRDB_HOST}:${CRDB_PORT}/defaultdb?sslmode=require"

    CRDB_CLIENT_URL="postgresql://${CRDB_USERNAME}:${CRDB_PASSWORD}@cockroachdb-0:${CRDB_PORT}/defaultdb?sslmode=require"

    echo "CRDB_CLIENT_URL=${CRDB_CLIENT_URL}"



    DATABASES=$(

src/device/Dockerfile

+2 −1
Original line number Diff line number Diff line
@@ -91,12 +91,13 @@ RUN touch tests/tools/mock_ietf_actn_sdn_ctrl/__init__.py 
COPY src/tests/tools/mock_ietf_actn_sdn_ctrl/. tests/tools/mock_ietf_actn_sdn_ctrl/



# Clone OpenConfig YANG models

RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public

RUN mkdir -p /tmp/openconfig

RUN git clone https://github.com/openconfig/public.git /tmp/openconfig

WORKDIR /tmp/openconfig

RUN git fetch

RUN git checkout v4.4.0

RUN rm -rf /var/teraflow/device/service/drivers/gnmi_openconfig/git

RUN mkdir -p /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public

RUN mv /tmp/openconfig/release /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public

RUN mv /tmp/openconfig/third_party /var/teraflow/device/service/drivers/gnmi_openconfig/git/openconfig/public

RUN rm -rf /tmp/openconfig

src/webui/service/templates/base.html

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ 
          <div class="container">

            <div class="row">

              <div class="col-md-12">

                <p class="text-center" style="color: white;">&copy; 2022-2024 <a href="https://tfs.etsi.org/">ETSI OSG/SDG TeraFlowSDN (TFS)</a></p>

                <p class="text-center" style="color: white;">&copy; 2022-2024 <a href="https://tfs.etsi.org/">ETSI SDG TeraFlowSDN (TFS)</a></p>

              </div>

            </div>

            <div class="row">

src/webui/service/templates/js/topology.js

+23 −22
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ d3.json("{{ url_for('main.topology') }}", function(data) { 
            return l.name.toLowerCase().includes('mgmt') ? "5,5" : "0";

        });



     optical_link = svg.append("g").attr("class", "links").style('stroke', '#aaa')

    optical_link = svg.append("g").attr("class", "links")//.style('stroke', '#aaa')

        .selectAll("line")

        .data(data.optical_links)

        .enter()
@@ -130,18 +130,19 @@ d3.json("{{ url_for('main.topology') }}", function(data) { 
    simulation.nodes(data.devices);



    // add forces, associate each with a name, and set their properties

    // Experimental : Optical link part 

    all_links = data.links.concat(data.optical_links)

    simulation

        .force("link", d3.forceLink()

            .id(function(d) {return d.id;})

            .distance(forceProperties.link.distance)

            .iterations(forceProperties.link.iterations)

            .links(forceProperties.link.enabled ? data.links.length>0? data.links :[]:[]))

//  ------------------    Experimental : Optical link part 

        .force("link", d3.forceLink()

            .id(function(d) {return d.id;})

            .distance(forceProperties.link.distance)

            .iterations(forceProperties.link.iterations)

            .links(forceProperties.link.enabled ?  data.optical_links.length>0?data.optical_links:[]:[])) 

            .links(

                forceProperties.link.enabled ? (

                    (all_links.length > 0) ? all_links : []

                ) : []

            )

        )



        .force("charge", d3.forceManyBody()

            .strength(forceProperties.charge.strength * forceProperties.charge.enabled)