diff --git a/hackfest/commands.txt b/hackfest/commands.txt
index 31558364d74aa1fec729c80c9fab50aa7e0c2313..c8e4868de5186b9ba9ad20ad1e632e97fdabc12c 100644
--- a/hackfest/commands.txt
+++ b/hackfest/commands.txt
@@ -115,6 +115,9 @@ python3 client_connection.py
cd ~/tfs-ctrl/hackfest/tapi/server
pip install -r requirements.txt
+cd ~/tfs-ctrl/hackfest/tapi/tapi_app
+./requirements.sh
+
# (done) Build & Implement methods for the TAPI v2.1.3 server:
cd ~/tfs-ctrl/hackfest/tapi
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.35/swagger-codegen-cli-3.0.35.jar
@@ -134,7 +137,7 @@ cd ~/tfs-ctrl/hackfest/tapi/server
python3 -m tapi_server 8080 database/mini-ols-context.json
# Run TAPI client using cURL (In a new window):
-$ cd ~/tfs-ctrl/hackfest/tapi/client
+cd ~/tfs-ctrl/hackfest/tapi/client
# Interrogate Context and SIPs:
curl -X GET -H "Content-Type: application/json" http://127.0.0.1:8080/restconf/data/tapi-common:context/
@@ -175,24 +178,30 @@ python3 tapi_app.py
# Deploy TeraFlowSDN
################################################################################
-# Check status of Kubernetes
+# Check status of MicroK8s
microk8s.status --wait-ready
+# If not running, start MicroK8s
+microk8s.start
+
+# Periodically inspect status of MicroK8s until all addons are enabled
+watch -n 1 microk8s.status --wait-ready
+
# Check all resources in Kubernetes
-microk8s.kubectl get all --all-namespaces
+watch -n 1 kubectl get all --all-namespaces
# Deploy TeraFlowSDN
cd ~/tfs-ctrl
source my_deploy.sh
-./deploy.sh
+./deploy/all.sh
# Show status of your deployment
(if new terminal) cd ~/tfs-ctrl && source my_deploy.sh
-./show_deploy.sh
+./deploy/show.sh
# Show logs of a specific component
(if new terminal) cd ~/tfs-ctrl && source my_deploy.sh
-scripts/show_logs_device.sh
+./scripts/show_logs_device.sh
@@ -262,6 +271,8 @@ Service b8c99e2c-39d8-424d-9833-554634269555 deleted
(mock-osm) exit
Bye!
+
+
############
# gNMI
############
diff --git a/hackfest/tfs-descriptors/context-topology.json b/hackfest/tfs-descriptors/context-topology.json
index 36b3c44fd61fdec9d208a82a11d5a16c3671d004..afc2cc258889b445cb8d5f21b7e5fddac6a56db1 100644
--- a/hackfest/tfs-descriptors/context-topology.json
+++ b/hackfest/tfs-descriptors/context-topology.json
@@ -1,19 +1,13 @@
{
"contexts": [
- {
- "context_id": {"context_uuid": {"uuid": "admin"}},
- "topology_ids": [],
- "service_ids": []
- }
+ {"context_id": {"context_uuid": {"uuid": "admin"}}}
],
"topologies": [
{
"topology_id": {
"context_id": {"context_uuid": {"uuid": "admin"}},
"topology_uuid": {"uuid": "admin"}
- },
- "device_ids": [],
- "link_ids": []
+ }
}
]
}
diff --git a/hackfest/tfs-descriptors/device-all.json b/hackfest/tfs-descriptors/device-all.json
index 8cb8e031488f0dd1fa4176b8d20d01fe2d24abc9..b16d80e003039b4d34d5e4a6cd57ff75d629ab5c 100644
--- a/hackfest/tfs-descriptors/device-all.json
+++ b/hackfest/tfs-descriptors/device-all.json
@@ -4,7 +4,7 @@
"device_id": {"device_uuid": {"uuid": "R1"}},
"device_type": "packet-router",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8301"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
"username": "admin", "password": "admin",
@@ -21,7 +21,7 @@
"device_id": {"device_uuid": {"uuid": "R2"}},
"device_type": "packet-router",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8302"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
"username": "admin", "password": "admin",
@@ -38,7 +38,7 @@
"device_id": {"device_uuid": {"uuid": "R3"}},
"device_type": "packet-router",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8303"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
"username": "admin", "password": "admin",
@@ -55,7 +55,7 @@
"device_id": {"device_uuid": {"uuid": "R4"}},
"device_type": "packet-router",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8304"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
"username": "admin", "password": "admin",
@@ -72,7 +72,7 @@
"device_id": {"device_uuid": {"uuid": "OLS"}},
"device_type": "open-line-system",
"device_config": {"config_rules": [
- {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.10"}},
{"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8080"}},
{"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"timeout": 120}}}
]},
diff --git a/my_deploy.sh b/my_deploy.sh
index 6f0e64afe311b8e56446caabfac6329024c207a9..f6caa03818ec878c3d35d57bc64403ff5c74af6c 100755
--- a/my_deploy.sh
+++ b/my_deploy.sh
@@ -20,7 +20,7 @@
export TFS_REGISTRY_IMAGES="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 automation monitoring pathcomp service slice compute webui load_generator"
+export TFS_COMPONENTS="context device automation pathcomp service slice compute webui"
# Set the tag you want to use for your images.
export TFS_IMAGE_TAG="dev"
@@ -56,8 +56,8 @@ export CRDB_DATABASE="tfs"
# See ./deploy/all.sh or ./deploy/crdb.sh for additional details
export CRDB_DEPLOY_MODE="single"
-# Disable flag for dropping database, if exists.
-export CRDB_DROP_DATABASE_IF_EXISTS=""
+# Enable flag for dropping database, if exists.
+export CRDB_DROP_DATABASE_IF_EXISTS="YES"
# Disable flag for re-deploying CockroachDB from scratch.
export CRDB_REDEPLOY=""