Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TFS
controller
Commits
ee163f7d
Commit
ee163f7d
authored
2 years ago
by
famelis
Browse files
Options
Downloads
Patches
Plain Diff
feat: recalculate path rpc
parent
3371071a
No related branches found
No related tags found
2 merge requests
!142
Release TeraFlowSDN 2.1
,
!123
Add missing policy actions in serializer
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
my_deploy.sh
+4
-4
4 additions, 4 deletions
my_deploy.sh
src/tests/p4/tests/Objects.py
+57
-0
57 additions, 0 deletions
src/tests/p4/tests/Objects.py
with
61 additions
and
4 deletions
my_deploy.sh
+
4
−
4
View file @
ee163f7d
...
@@ -23,10 +23,10 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
...
@@ -23,10 +23,10 @@ export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"
export
TFS_COMPONENTS
=
"context device pathcomp service slice compute webui load_generator"
export
TFS_COMPONENTS
=
"context device pathcomp service slice compute webui load_generator"
# Uncoment to activate Monitoring
# Uncoment to activate Monitoring
#
export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"
export
TFS_COMPONENTS
=
"
${
TFS_COMPONENTS
}
monitoring"
# Uncoment to activate Automation and Policy Manager
# Uncoment to activate Automation and Policy Manager
#
export TFS_COMPONENTS="${TFS_COMPONENTS} automation policy"
export
TFS_COMPONENTS
=
"
${
TFS_COMPONENTS
}
automation policy"
# Uncoment to activate Optical CyberSecurity
# Uncoment to activate Optical CyberSecurity
#export TFS_COMPONENTS="${TFS_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector opticalattackmanager"
#export TFS_COMPONENTS="${TFS_COMPONENTS} dbscanserving opticalattackmitigator opticalattackdetector opticalattackmanager"
...
@@ -78,10 +78,10 @@ export CRDB_DATABASE="tfs"
...
@@ -78,10 +78,10 @@ export CRDB_DATABASE="tfs"
export
CRDB_DEPLOY_MODE
=
"single"
export
CRDB_DEPLOY_MODE
=
"single"
# Disable flag for dropping database, if it exists.
# Disable flag for dropping database, if it exists.
export
CRDB_DROP_DATABASE_IF_EXISTS
=
""
export
CRDB_DROP_DATABASE_IF_EXISTS
=
"
YES
"
# Disable flag for re-deploying CockroachDB from scratch.
# Disable flag for re-deploying CockroachDB from scratch.
export
CRDB_REDEPLOY
=
""
export
CRDB_REDEPLOY
=
"
YES
"
# ----- NATS -------------------------------------------------------------------
# ----- NATS -------------------------------------------------------------------
...
...
This diff is collapsed.
Click to expand it.
src/tests/p4/tests/Objects.py
+
57
−
0
View file @
ee163f7d
...
@@ -360,48 +360,93 @@ LINK_SW1_SW2_UUID = get_link_uuid(ENDPOINT_ID_SW1_1, ENDPOINT_ID_SW2_1
...
@@ -360,48 +360,93 @@ LINK_SW1_SW2_UUID = get_link_uuid(ENDPOINT_ID_SW1_1, ENDPOINT_ID_SW2_1
LINK_SW1_SW2_ID
=
json_link_id
(
LINK_SW1_SW2_UUID
)
LINK_SW1_SW2_ID
=
json_link_id
(
LINK_SW1_SW2_UUID
)
LINK_SW1_SW2
=
json_link
(
LINK_SW1_SW2_UUID
,
[
ENDPOINT_ID_SW1_1
,
ENDPOINT_ID_SW2_1
])
LINK_SW1_SW2
=
json_link
(
LINK_SW1_SW2_UUID
,
[
ENDPOINT_ID_SW1_1
,
ENDPOINT_ID_SW2_1
])
# SW2_1 - SW1_1
LINK_SW2_SW1_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW2_1
,
ENDPOINT_ID_SW1_1
)
LINK_SW2_SW1_ID
=
json_link_id
(
LINK_SW2_SW1_UUID
)
LINK_SW2_SW1
=
json_link
(
LINK_SW2_SW1_UUID
,
[
ENDPOINT_ID_SW2_1
,
ENDPOINT_ID_SW1_1
])
# SW1_2 - SW4_1
# SW1_2 - SW4_1
LINK_SW1_SW4_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW1_2
,
ENDPOINT_ID_SW4_1
)
LINK_SW1_SW4_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW1_2
,
ENDPOINT_ID_SW4_1
)
LINK_SW1_SW4_ID
=
json_link_id
(
LINK_SW1_SW4_UUID
)
LINK_SW1_SW4_ID
=
json_link_id
(
LINK_SW1_SW4_UUID
)
LINK_SW1_SW4
=
json_link
(
LINK_SW1_SW4_UUID
,
[
ENDPOINT_ID_SW1_2
,
ENDPOINT_ID_SW4_1
])
LINK_SW1_SW4
=
json_link
(
LINK_SW1_SW4_UUID
,
[
ENDPOINT_ID_SW1_2
,
ENDPOINT_ID_SW4_1
])
# SW4_1 - SW1_2
LINK_SW4_SW1_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW4_1
,
ENDPOINT_ID_SW1_2
)
LINK_SW4_SW1_ID
=
json_link_id
(
LINK_SW4_SW1_UUID
)
LINK_SW4_SW1
=
json_link
(
LINK_SW4_SW1_UUID
,
[
ENDPOINT_ID_SW4_1
,
ENDPOINT_ID_SW1_2
])
# SW1_3 - SW6_1
# SW1_3 - SW6_1
LINK_SW1_SW6_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW1_3
,
ENDPOINT_ID_SW6_1
)
LINK_SW1_SW6_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW1_3
,
ENDPOINT_ID_SW6_1
)
LINK_SW1_SW6_ID
=
json_link_id
(
LINK_SW1_SW6_UUID
)
LINK_SW1_SW6_ID
=
json_link_id
(
LINK_SW1_SW6_UUID
)
LINK_SW1_SW6
=
json_link
(
LINK_SW1_SW6_UUID
,
[
ENDPOINT_ID_SW1_3
,
ENDPOINT_ID_SW6_1
])
LINK_SW1_SW6
=
json_link
(
LINK_SW1_SW6_UUID
,
[
ENDPOINT_ID_SW1_3
,
ENDPOINT_ID_SW6_1
])
# SW6_1 - SW1_3
LINK_SW6_SW1_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW6_1
,
ENDPOINT_ID_SW1_3
)
LINK_SW6_SW1_ID
=
json_link_id
(
LINK_SW6_SW1_UUID
)
LINK_SW6_SW1
=
json_link
(
LINK_SW6_SW1_UUID
,
[
ENDPOINT_ID_SW6_1
,
ENDPOINT_ID_SW1_3
])
# Middle links (SW{2n}-SW{2n+1})
# Middle links (SW{2n}-SW{2n+1})
# SW2_2 - SW3_1
# SW2_2 - SW3_1
LINK_SW2_SW3_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW2_2
,
ENDPOINT_ID_SW3_1
)
LINK_SW2_SW3_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW2_2
,
ENDPOINT_ID_SW3_1
)
LINK_SW2_SW3_ID
=
json_link_id
(
LINK_SW2_SW3_UUID
)
LINK_SW2_SW3_ID
=
json_link_id
(
LINK_SW2_SW3_UUID
)
LINK_SW2_SW3
=
json_link
(
LINK_SW2_SW3_UUID
,
[
ENDPOINT_ID_SW2_2
,
ENDPOINT_ID_SW3_1
])
LINK_SW2_SW3
=
json_link
(
LINK_SW2_SW3_UUID
,
[
ENDPOINT_ID_SW2_2
,
ENDPOINT_ID_SW3_1
])
# SW3_1 - SW2_2
LINK_SW3_SW2_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW3_1
,
ENDPOINT_ID_SW2_2
)
LINK_SW3_SW2_ID
=
json_link_id
(
LINK_SW3_SW2_UUID
)
LINK_SW3_SW2
=
json_link
(
LINK_SW3_SW2_UUID
,
[
ENDPOINT_ID_SW3_1
,
ENDPOINT_ID_SW2_2
])
# SW4_2 - SW5_1
# SW4_2 - SW5_1
LINK_SW4_SW5_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW4_2
,
ENDPOINT_ID_SW5_1
)
LINK_SW4_SW5_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW4_2
,
ENDPOINT_ID_SW5_1
)
LINK_SW4_SW5_ID
=
json_link_id
(
LINK_SW4_SW5_UUID
)
LINK_SW4_SW5_ID
=
json_link_id
(
LINK_SW4_SW5_UUID
)
LINK_SW4_SW5
=
json_link
(
LINK_SW4_SW5_UUID
,
[
ENDPOINT_ID_SW4_2
,
ENDPOINT_ID_SW5_1
])
LINK_SW4_SW5
=
json_link
(
LINK_SW4_SW5_UUID
,
[
ENDPOINT_ID_SW4_2
,
ENDPOINT_ID_SW5_1
])
# SW5_1 - SW4_2
LINK_SW5_SW4_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW5_1
,
ENDPOINT_ID_SW4_2
)
LINK_SW5_SW4_ID
=
json_link_id
(
LINK_SW5_SW4_UUID
)
LINK_SW5_SW4
=
json_link
(
LINK_SW5_SW4_UUID
,
[
ENDPOINT_ID_SW5_1
,
ENDPOINT_ID_SW4_2
])
# SW6_2 - SW7_1
# SW6_2 - SW7_1
LINK_SW6_SW7_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW6_2
,
ENDPOINT_ID_SW7_1
)
LINK_SW6_SW7_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW6_2
,
ENDPOINT_ID_SW7_1
)
LINK_SW6_SW7_ID
=
json_link_id
(
LINK_SW6_SW7_UUID
)
LINK_SW6_SW7_ID
=
json_link_id
(
LINK_SW6_SW7_UUID
)
LINK_SW6_SW7
=
json_link
(
LINK_SW6_SW7_UUID
,
[
ENDPOINT_ID_SW6_2
,
ENDPOINT_ID_SW7_1
])
LINK_SW6_SW7
=
json_link
(
LINK_SW6_SW7_UUID
,
[
ENDPOINT_ID_SW6_2
,
ENDPOINT_ID_SW7_1
])
# SW7_1 - SW6_2
LINK_SW7_SW6_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW7_1
,
ENDPOINT_ID_SW6_2
)
LINK_SW7_SW6_ID
=
json_link_id
(
LINK_SW7_SW6_UUID
)
LINK_SW7_SW6
=
json_link
(
LINK_SW7_SW6_UUID
,
[
ENDPOINT_ID_SW7_1
,
ENDPOINT_ID_SW6_2
])
# Rightmost links (SW{2n+1}-SW8)
# Rightmost links (SW{2n+1}-SW8)
# SW3_2 - SW8_1
# SW3_2 - SW8_1
LINK_SW3_SW8_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW3_2
,
ENDPOINT_ID_SW8_1
)
LINK_SW3_SW8_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW3_2
,
ENDPOINT_ID_SW8_1
)
LINK_SW3_SW8_ID
=
json_link_id
(
LINK_SW3_SW8_UUID
)
LINK_SW3_SW8_ID
=
json_link_id
(
LINK_SW3_SW8_UUID
)
LINK_SW3_SW8
=
json_link
(
LINK_SW3_SW8_UUID
,
[
ENDPOINT_ID_SW3_2
,
ENDPOINT_ID_SW8_1
])
LINK_SW3_SW8
=
json_link
(
LINK_SW3_SW8_UUID
,
[
ENDPOINT_ID_SW3_2
,
ENDPOINT_ID_SW8_1
])
# SW8_1 - SW3_2
LINK_SW8_SW3_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW8_1
,
ENDPOINT_ID_SW3_2
)
LINK_SW8_SW3_ID
=
json_link_id
(
LINK_SW8_SW3_UUID
)
LINK_SW8_SW3
=
json_link
(
LINK_SW8_SW3_UUID
,
[
ENDPOINT_ID_SW8_1
,
ENDPOINT_ID_SW3_2
])
# SW5_2 - SW8_2
# SW5_2 - SW8_2
LINK_SW5_SW8_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW5_2
,
ENDPOINT_ID_SW8_2
)
LINK_SW5_SW8_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW5_2
,
ENDPOINT_ID_SW8_2
)
LINK_SW5_SW8_ID
=
json_link_id
(
LINK_SW5_SW8_UUID
)
LINK_SW5_SW8_ID
=
json_link_id
(
LINK_SW5_SW8_UUID
)
LINK_SW5_SW8
=
json_link
(
LINK_SW5_SW8_UUID
,
[
ENDPOINT_ID_SW5_2
,
ENDPOINT_ID_SW8_2
])
LINK_SW5_SW8
=
json_link
(
LINK_SW5_SW8_UUID
,
[
ENDPOINT_ID_SW5_2
,
ENDPOINT_ID_SW8_2
])
# SW8_2 - SW8_2
LINK_SW8_SW5_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW8_2
,
ENDPOINT_ID_SW5_2
)
LINK_SW8_SW5_ID
=
json_link_id
(
LINK_SW8_SW5_UUID
)
LINK_SW8_SW5
=
json_link
(
LINK_SW8_SW5_UUID
,
[
ENDPOINT_ID_SW8_2
,
ENDPOINT_ID_SW5_2
])
# SW7_2 - SW8_3
# SW7_2 - SW8_3
LINK_SW7_SW8_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW7_2
,
ENDPOINT_ID_SW8_3
)
LINK_SW7_SW8_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW7_2
,
ENDPOINT_ID_SW8_3
)
LINK_SW7_SW8_ID
=
json_link_id
(
LINK_SW7_SW8_UUID
)
LINK_SW7_SW8_ID
=
json_link_id
(
LINK_SW7_SW8_UUID
)
LINK_SW7_SW8
=
json_link
(
LINK_SW7_SW8_UUID
,
[
ENDPOINT_ID_SW7_2
,
ENDPOINT_ID_SW8_3
])
LINK_SW7_SW8
=
json_link
(
LINK_SW7_SW8_UUID
,
[
ENDPOINT_ID_SW7_2
,
ENDPOINT_ID_SW8_3
])
# SW8_3 - SW7_2
LINK_SW8_SW7_UUID
=
get_link_uuid
(
ENDPOINT_ID_SW8_3
,
ENDPOINT_ID_SW7_2
)
LINK_SW8_SW7_ID
=
json_link_id
(
LINK_SW8_SW7_UUID
)
LINK_SW8_SW7
=
json_link
(
LINK_SW8_SW7_UUID
,
[
ENDPOINT_ID_SW8_3
,
ENDPOINT_ID_SW7_2
])
# ----- Service ----------------------------------------------------------------------------------------------------------
# ----- Service ----------------------------------------------------------------------------------------------------------
SERVICE_SW1_SW8_UUID
=
get_service_uuid
(
ENDPOINT_ID_SW1_4
,
ENDPOINT_ID_SW8_4
)
SERVICE_SW1_SW8_UUID
=
get_service_uuid
(
ENDPOINT_ID_SW1_4
,
ENDPOINT_ID_SW8_4
)
...
@@ -436,6 +481,18 @@ LINKS = [
...
@@ -436,6 +481,18 @@ LINKS = [
LINK_SW3_SW8
,
LINK_SW3_SW8
,
LINK_SW5_SW8
,
LINK_SW5_SW8
,
LINK_SW7_SW8
,
LINK_SW7_SW8
,
LINK_SW2_SW1
,
LINK_SW4_SW1
,
LINK_SW6_SW1
,
LINK_SW3_SW2
,
LINK_SW5_SW4
,
LINK_SW7_SW6
,
LINK_SW8_SW3
,
LINK_SW8_SW5
,
LINK_SW8_SW7
,
]
]
SERVICES
=
[
SERVICES
=
[
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment