Commit dec85f68 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Scenario 2: 

- Deactivated domains 3 and 4
- Updated descriptor for domain 1
parent 2c4b3f42

src/tests/scenario2/deploy_all.sh

+9 −9
Original line number Diff line number Diff line
@@ -45,12 +45,12 @@ source nfvsdn22/deploy_specs_dom2.sh 
./deploy/all.sh

mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom2.sh



# Deploy TFS for Domain 3

source nfvsdn22/deploy_specs_dom3.sh

./deploy/all.sh

mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom3.sh



# Deploy TFS for Domain 4

source nfvsdn22/deploy_specs_dom4.sh

./deploy/all.sh

mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom4.sh
 
## Deploy TFS for Domain 3

#source nfvsdn22/deploy_specs_dom3.sh

#./deploy/all.sh

#mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom3.sh

#

## Deploy TFS for Domain 4

#source nfvsdn22/deploy_specs_dom4.sh

#./deploy/all.sh

#mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_dom4.sh

src/tests/scenario2/descriptors/domain1.json

+3 −12
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
        {"context_id": {"context_uuid": {"uuid": "admin"}}}

    ],

    "topologies": [

        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "inter"}}},

        {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}}}

    ],

    "devices": [
@@ -12,8 +13,8 @@ 
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [

                    {"uuid": "D1",  "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "D1"},

                    {"uuid": "int", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "D1"}

                    {"uuid": "D1",  "type": "copper/border",   "context_uuid": "admin", "topology_uuid": "inter"},

                    {"uuid": "int", "type": "copper/internal", "context_uuid": "admin", "topology_uuid": "inter"}

                ]}}}

            ]}

        },
@@ -79,16 +80,6 @@ 
        }

    ],

    "links": [

        {

            "link_id": {"link_uuid": {"uuid": "DC1/D1==R1@D1/DC1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "DC1"}}, "endpoint_uuid": {"uuid": "D1"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }},

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "DC1"}, "topology_id": {

                    "context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "D1"}

                }}

            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R1@D1/2==R2@D1/1"}}, "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R1@D1"}}, "endpoint_uuid": {"uuid": "2"}, "topology_id": {

src/tests/scenario2/dump_logs.sh

+31 −31
Original line number Diff line number Diff line
@@ -51,36 +51,36 @@ kubectl --namespace tfs-dom2 logs deployments/computeservice server > tmp/tfs-do 
kubectl --namespace tfs-dom2 logs deployments/webuiservice server > tmp/tfs-dom2/exec/webui.log

printf "\n"



echo "Collecting logs for Domain 3..."

rm -rf tmp/tfs-dom3/exec

mkdir -p tmp/tfs-dom3/exec

kubectl --namespace tfs-dom3 logs deployments/contextservice server > tmp/tfs-dom3/exec/context.log

kubectl --namespace tfs-dom3 logs deployments/deviceservice server > tmp/tfs-dom3/exec/device.log

kubectl --namespace tfs-dom3 logs deployments/serviceservice server > tmp/tfs-dom3/exec/service.log

kubectl --namespace tfs-dom3 logs deployments/pathcompservice frontend > tmp/tfs-dom3/exec/pathcomp-frontend.log

kubectl --namespace tfs-dom3 logs deployments/pathcompservice backend > tmp/tfs-dom3/exec/pathcomp-backend.log

kubectl --namespace tfs-dom3 logs deployments/sliceservice server > tmp/tfs-dom3/exec/slice.log

kubectl --namespace tfs-dom3 logs deployments/interdomainservice server > tmp/tfs-dom3/exec/interdomain.log

kubectl --namespace tfs-dom3 logs deployments/dltservice connector > tmp/tfs-dom3/exec/dlt-connector.log

#kubectl --namespace tfs-dom3 logs deployments/dltservice gateway > tmp/tfs-dom3/exec/dlt-gateway.log

kubectl --namespace tfs-dom3 logs deployments/computeservice server > tmp/tfs-dom3/exec/compute.log

kubectl --namespace tfs-dom3 logs deployments/webuiservice server > tmp/tfs-dom3/exec/webui.log

printf "\n"



echo "Collecting logs for Domain 4..."

rm -rf tmp/tfs-dom4/exec

mkdir -p tmp/tfs-dom4/exec

kubectl --namespace tfs-dom4 logs deployments/contextservice server > tmp/tfs-dom4/exec/context.log

kubectl --namespace tfs-dom4 logs deployments/deviceservice server > tmp/tfs-dom4/exec/device.log

kubectl --namespace tfs-dom4 logs deployments/serviceservice server > tmp/tfs-dom4/exec/service.log

kubectl --namespace tfs-dom4 logs deployments/pathcompservice frontend > tmp/tfs-dom4/exec/pathcomp-frontend.log

kubectl --namespace tfs-dom4 logs deployments/pathcompservice backend > tmp/tfs-dom4/exec/pathcomp-backend.log

kubectl --namespace tfs-dom4 logs deployments/sliceservice server > tmp/tfs-dom4/exec/slice.log

kubectl --namespace tfs-dom4 logs deployments/interdomainservice server > tmp/tfs-dom4/exec/interdomain.log

kubectl --namespace tfs-dom4 logs deployments/dltservice connector > tmp/tfs-dom4/exec/dlt-connector.log

#kubectl --namespace tfs-dom4 logs deployments/dltservice gateway > tmp/tfs-dom4/exec/dlt-gateway.log

kubectl --namespace tfs-dom4 logs deployments/computeservice server > tmp/tfs-dom4/exec/compute.log

kubectl --namespace tfs-dom4 logs deployments/webuiservice server > tmp/tfs-dom4/exec/webui.log

printf "\n"

#echo "Collecting logs for Domain 3..."

#rm -rf tmp/tfs-dom3/exec

#mkdir -p tmp/tfs-dom3/exec

#kubectl --namespace tfs-dom3 logs deployments/contextservice server > tmp/tfs-dom3/exec/context.log

#kubectl --namespace tfs-dom3 logs deployments/deviceservice server > tmp/tfs-dom3/exec/device.log

#kubectl --namespace tfs-dom3 logs deployments/serviceservice server > tmp/tfs-dom3/exec/service.log

#kubectl --namespace tfs-dom3 logs deployments/pathcompservice frontend > tmp/tfs-dom3/exec/pathcomp-frontend.log

#kubectl --namespace tfs-dom3 logs deployments/pathcompservice backend > tmp/tfs-dom3/exec/pathcomp-backend.log

#kubectl --namespace tfs-dom3 logs deployments/sliceservice server > tmp/tfs-dom3/exec/slice.log

#kubectl --namespace tfs-dom3 logs deployments/interdomainservice server > tmp/tfs-dom3/exec/interdomain.log

#kubectl --namespace tfs-dom3 logs deployments/dltservice connector > tmp/tfs-dom3/exec/dlt-connector.log

##kubectl --namespace tfs-dom3 logs deployments/dltservice gateway > tmp/tfs-dom3/exec/dlt-gateway.log

#kubectl --namespace tfs-dom3 logs deployments/computeservice server > tmp/tfs-dom3/exec/compute.log

#kubectl --namespace tfs-dom3 logs deployments/webuiservice server > tmp/tfs-dom3/exec/webui.log

#printf "\n"

#

#echo "Collecting logs for Domain 4..."

#rm -rf tmp/tfs-dom4/exec

#mkdir -p tmp/tfs-dom4/exec

#kubectl --namespace tfs-dom4 logs deployments/contextservice server > tmp/tfs-dom4/exec/context.log

#kubectl --namespace tfs-dom4 logs deployments/deviceservice server > tmp/tfs-dom4/exec/device.log

#kubectl --namespace tfs-dom4 logs deployments/serviceservice server > tmp/tfs-dom4/exec/service.log

#kubectl --namespace tfs-dom4 logs deployments/pathcompservice frontend > tmp/tfs-dom4/exec/pathcomp-frontend.log

#kubectl --namespace tfs-dom4 logs deployments/pathcompservice backend > tmp/tfs-dom4/exec/pathcomp-backend.log

#kubectl --namespace tfs-dom4 logs deployments/sliceservice server > tmp/tfs-dom4/exec/slice.log

#kubectl --namespace tfs-dom4 logs deployments/interdomainservice server > tmp/tfs-dom4/exec/interdomain.log

#kubectl --namespace tfs-dom4 logs deployments/dltservice connector > tmp/tfs-dom4/exec/dlt-connector.log

##kubectl --namespace tfs-dom4 logs deployments/dltservice gateway > tmp/tfs-dom4/exec/dlt-gateway.log

#kubectl --namespace tfs-dom4 logs deployments/computeservice server > tmp/tfs-dom4/exec/compute.log

#kubectl --namespace tfs-dom4 logs deployments/webuiservice server > tmp/tfs-dom4/exec/webui.log

#printf "\n"



echo "Done!"