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

NFV-SDN'22:

- updated per-domain topology descriptors
- added inter-domain slice descriptor
- updated deploy_specs per domain
- added deploy_logs script
- re-activated deployment of all domains
parent e43eb563
Loading
Loading
Loading
Loading
+13 −13
Changes for src/tests/scenario2/deploy_all.sh: 13 added lines, 13 removed lines.
Original line number Diff line number Diff line
#!/bin/bash

# Delete old namespaces
kubectl delete namespace tfs-dom1 #tfs-dom2 tfs-dom3 tfs-dom4
kubectl delete namespace tfs-dom1 tfs-dom2 tfs-dom3 tfs-dom4

# Delete secondary ingress controllers
kubectl delete -f nfvsdn22/nginx-ingress-controller-dom1.yaml
#kubectl delete -f nfvsdn22/nginx-ingress-controller-dom2.yaml
#kubectl delete -f nfvsdn22/nginx-ingress-controller-dom3.yaml
#kubectl delete -f nfvsdn22/nginx-ingress-controller-dom4.yaml
kubectl delete -f nfvsdn22/nginx-ingress-controller-dom2.yaml
kubectl delete -f nfvsdn22/nginx-ingress-controller-dom3.yaml
kubectl delete -f nfvsdn22/nginx-ingress-controller-dom4.yaml

# Delete MockBlockchain
kubectl delete namespace tfs-bchain

# Create secondary ingress controllers
kubectl apply -f nfvsdn22/nginx-ingress-controller-dom1.yaml
#kubectl apply -f nfvsdn22/nginx-ingress-controller-dom2.yaml
#kubectl apply -f nfvsdn22/nginx-ingress-controller-dom3.yaml
#kubectl apply -f nfvsdn22/nginx-ingress-controller-dom4.yaml
kubectl apply -f nfvsdn22/nginx-ingress-controller-dom2.yaml
kubectl apply -f nfvsdn22/nginx-ingress-controller-dom3.yaml
kubectl apply -f nfvsdn22/nginx-ingress-controller-dom4.yaml

# Create MockBlockchain
./deploy_mock_blockchain.sh
@@ -26,13 +26,13 @@ source nfvsdn22/deploy_specs_dom1.sh
./deploy.sh

# Deploy TFS for Domain 2
#source nfvsdn22/deploy_specs_dom2.sh
#./deploy.sh
source nfvsdn22/deploy_specs_dom2.sh
./deploy.sh

# Deploy TFS for Domain 3
#source nfvsdn22/deploy_specs_dom3.sh
#./deploy.sh
source nfvsdn22/deploy_specs_dom3.sh
./deploy.sh

# Deploy TFS for Domain 4
#source nfvsdn22/deploy_specs_dom4.sh
#./deploy.sh
source nfvsdn22/deploy_specs_dom4.sh
./deploy.sh
+6 −1
Changes for src/tests/scenario2/deploy_specs_dom1.sh: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@
export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"

# Set the list of components, separated by spaces, you want to build images for, and deploy.
export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
#export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
export TFS_COMPONENTS="context device dlt interdomain webui"

# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -15,3 +16,7 @@ export TFS_EXTRA_MANIFESTS="nfvsdn22/tfs-ingress-dom1.yaml"

# Set the neew Grafana admin password
export TFS_GRAFANA_PASSWORD="admin123+"

# If not already set, disable skip-build flag.
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
export TFS_SKIP_BUILD="NO"
+6 −1
Changes for src/tests/scenario2/deploy_specs_dom2.sh: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@
export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"

# Set the list of components, separated by spaces, you want to build images for, and deploy.
export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
#export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
export TFS_COMPONENTS="context device dlt interdomain webui"

# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -15,3 +16,7 @@ export TFS_EXTRA_MANIFESTS="nfvsdn22/tfs-ingress-dom2.yaml"

# Set the neew Grafana admin password
export TFS_GRAFANA_PASSWORD="admin123+"

# If not already set, disable skip-build flag.
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
export TFS_SKIP_BUILD="YES"
+6 −1
Changes for src/tests/scenario2/deploy_specs_dom3.sh: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@
export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"

# Set the list of components, separated by spaces, you want to build images for, and deploy.
export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
#export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
export TFS_COMPONENTS="context device dlt interdomain webui"

# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -15,3 +16,7 @@ export TFS_EXTRA_MANIFESTS="nfvsdn22/tfs-ingress-dom3.yaml"

# Set the neew Grafana admin password
export TFS_GRAFANA_PASSWORD="admin123+"

# If not already set, disable skip-build flag.
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
export TFS_SKIP_BUILD="YES"
+6 −1
Changes for src/tests/scenario2/deploy_specs_dom4.sh: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@
export TFS_REGISTRY_IMAGE="http://localhost:32000/tfs/"

# Set the list of components, separated by spaces, you want to build images for, and deploy.
export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
#export TFS_COMPONENTS="context device pathcomp service slice dlt interdomain webui"
export TFS_COMPONENTS="context device dlt interdomain webui"

# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -15,3 +16,7 @@ export TFS_EXTRA_MANIFESTS="nfvsdn22/tfs-ingress-dom4.yaml"

# Set the neew Grafana admin password
export TFS_GRAFANA_PASSWORD="admin123+"

# If not already set, disable skip-build flag.
# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.
export TFS_SKIP_BUILD="YES"
Loading