feat: UPF test script and minor fixes (b89f122c) · Commits · TFS / controller

src/tests/automation/test_functional_automation.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@

		import json
		import logging
		import os
		import uuid
		from common.proto.analytics_frontend_pb2 import AnalyzerId, AnalyzerOperationMode
		from common.proto.automation_pb2 import ZSMCreateRequest
		@@ -81,7 +82,6 @@ def test_service_zsm_create(

		# Add important information in the request
		loaded_request = _zsm_create_request(loaded_request, kpi_manager_client)
		# loaded_request = _static_zsm_create_request()

		# Invoke Automation
		automation_client.ZSMCreate(loaded_request)

src/tests/p4-sd-fabric-sbi-connectivity/descriptors/sbi-rules-insert-int-b1.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -120,7 +120,7 @@
		},
		{
		"match-field": "ipv4_dst",
		"match-value": "10.10.10.41&&&0xFFFFFFFF"
		"match-value": "192.168.5.137&&&0xFFFFFFFF"
		}
		],
		"action-name": "FabricIngress.int_watchlist.no_report_collector",

src/tests/p4-sd-fabric-sbi-connectivity/descriptors/sbi-rules-insert-int-b2.json

+18 −18

Original line number	Diff line number	Diff line
		@@ -34,15 +34,15 @@
		"action-params": [
		{
		"action-param": "src_ip",
		"action-value": "10.10.10.120"
		"action-value": "192.168.5.139"
		},
		{
		"action-param": "mon_ip",
		"action-value": "10.10.10.41"
		"action-value": "192.168.5.137"
		},
		{
		"action-param": "mon_port",
		"action-value": "32766"
		"action-value": "12345"
		},
		{
		"action-param": "switch_id",
		@@ -76,15 +76,15 @@
		"action-params": [
		{
		"action-param": "src_ip",
		"action-value": "10.10.10.120"
		"action-value": "192.168.5.139"
		},
		{
		"action-param": "mon_ip",
		"action-value": "10.10.10.41"
		"action-value": "192.168.5.137"
		},
		{
		"action-param": "mon_port",
		"action-value": "32766"
		"action-value": "12345"
		},
		{
		"action-param": "switch_id",
		@@ -118,15 +118,15 @@
		"action-params": [
		{
		"action-param": "src_ip",
		"action-value": "10.10.10.120"
		"action-value": "192.168.5.139"
		},
		{
		"action-param": "mon_ip",
		"action-value": "10.10.10.41"
		"action-value": "192.168.5.137"
		},
		{
		"action-param": "mon_port",
		"action-value": "32766"
		"action-value": "12345"
		},
		{
		"action-param": "switch_id",
		@@ -160,15 +160,15 @@
		"action-params": [
		{
		"action-param": "src_ip",
		"action-value": "10.10.10.120"
		"action-value": "192.168.5.139"
		},
		{
		"action-param": "mon_ip",
		"action-value": "10.10.10.41"
		"action-value": "192.168.5.137"
		},
		{
		"action-param": "mon_port",
		"action-value": "32766"
		"action-value": "12345"
		},
		{
		"action-param": "switch_id",
		@@ -202,15 +202,15 @@
		"action-params": [
		{
		"action-param": "src_ip",
		"action-value": "10.10.10.120"
		"action-value": "192.168.5.139"
		},
		{
		"action-param": "mon_ip",
		"action-value": "10.10.10.41"
		"action-value": "192.168.5.137"
		},
		{
		"action-param": "mon_port",
		"action-value": "32766"
		"action-value": "12345"
		},
		{
		"action-param": "switch_id",
		@@ -244,15 +244,15 @@
		"action-params": [
		{
		"action-param": "src_ip",
		"action-value": "10.10.10.120"
		"action-value": "192.168.5.139"
		},
		{
		"action-param": "mon_ip",
		"action-value": "10.10.10.41"
		"action-value": "192.168.5.137"
		},
		{
		"action-param": "mon_port",
		"action-value": "32766"
		"action-value": "12345"
		},
		{
		"action-param": "switch_id",

src/tests/p4-sd-fabric-sbi-connectivity/descriptors/sbi-rules-insert-int-b3.json

+4 −4

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@
		},
		{
		"match-field": "eth_dst",
		"match-value": "fa:16:3e:fb:cf:96"
		"match-value": "46:e4:58:c6:74:53"
		}
		],
		"action-name": "FabricIngress.forwarding.set_next_id_bridging",
		@@ -147,7 +147,7 @@
		"match-fields": [
		{
		"match-field": "ipv4_dst",
		"match-value": "10.10.10.41/32"
		"match-value": "192.168.5.137/32"
		}
		],
		"action-name": "FabricIngress.forwarding.set_next_id_routing_v4",
		@@ -180,11 +180,11 @@
		},
		{
		"action-param": "smac",
		"action-value": "fa:16:3e:93:8c:c0"
		"action-value": "ee:ee:8c:6c:f3:2c"
		},
		{
		"action-param": "dmac",
		"action-value": "fa:16:3e:fb:cf:96"
		"action-value": "46:e4:58:c6:74:53"
		}
		]
		}

src/tests/p4-sd-fabric-sbi-connectivity/descriptors/sbi-rules-insert-routing-east.json

+4 −4

Original line number	Diff line number	Diff line
		@@ -102,7 +102,7 @@
		},
		{
		"match-field": "eth_dst",
		"match-value": "fa:16:3e:e2:af:28"
		"match-value": "00:00:00:00:00:02"
		}
		],
		"action-name": "FabricIngress.forwarding.set_next_id_bridging",
		@@ -147,7 +147,7 @@
		"match-fields": [
		{
		"match-field": "ipv4_dst",
		"match-value": "172.16.10.9/32"
		"match-value": "10.0.0.2/32"
		}
		],
		"action-name": "FabricIngress.forwarding.set_next_id_routing_v4",
		@@ -180,11 +180,11 @@
		},
		{
		"action-param": "smac",
		"action-value": "fa:16:3e:9b:cb:a1"
		"action-value": "00:00:00:00:00:01"
		},
		{
		"action-param": "dmac",
		"action-value": "fa:16:3e:e2:af:28"
		"action-value": "00:00:00:00:00:02"
		}
		]
		}