Merge branch 'feat/242-cttc-l3slice-ietfslice-service-handler-is-required' into camara-integration (eb403ff2) · Commits · TFS / controller

src/service/service/service_handlers/l3slice_ietfslice/ConfigRules.py

+44 −5

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@ from common.tools.object_factory.ConfigRule import (
		json_config_rule_set,
		)
		from context.client.ContextClient import ContextClient
		from service.service.service_handler_api.AnyTreeTools import TreeNode


		def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
		@@ -30,11 +29,19 @@ def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
		src_ac_node_id: str = json_settings["src_ac_node_id"]
		src_ac_ep_id: str = json_settings["src_ac_ep_id"]
		src_vlan: str = json_settings["src_vlan"]
		src_source_ip_prefix: str = json_settings["src_source_ip_prefix"]
		src_source_tcp_port: str = json_settings["src_source_tcp_port"]
		src_destination_ip_prefix: str = json_settings["src_destination_ip_prefix"]
		src_destination_tcp_port: str = json_settings["src_destination_tcp_port"]
		dst_node_id: str = json_settings["dst_node_id"]
		dst_mgmt_ip_address: str = json_settings["dst_mgmt_ip_address"]
		dst_ac_node_id: str = json_settings["dst_ac_node_id"]
		dst_ac_ep_id: str = json_settings["dst_ac_ep_id"]
		dst_vlan: str = json_settings["dst_vlan"]
		dst_source_ip_prefix: str = json_settings["dst_source_ip_prefix"]
		dst_source_tcp_port: str = json_settings["dst_source_tcp_port"]
		dst_destination_ip_prefix: str = json_settings["dst_destination_ip_prefix"]
		dst_destination_tcp_port: str = json_settings["dst_destination_tcp_port"]
		slice_id: str = json_settings["slice_id"]
		delay: str = json_settings["delay"]
		bandwidth: str = json_settings["bandwidth"]
		@@ -54,6 +61,22 @@ def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
		"type": "ietf-network-slice-service:vlan",
		"value": [src_vlan],
		},
		{
		"type": "ietf-network-slice-service:source-ip-prefix",
		"value": [src_source_ip_prefix],
		},
		{
		"type": "ietf-network-slice-service:source-tcp-port",
		"value": [src_source_tcp_port],
		},
		{
		"type": "ietf-network-slice-service:destination-ip-prefix",
		"value": [src_destination_ip_prefix],
		},
		{
		"type": "ietf-network-slice-service:destination-tcp-port",
		"value": [src_destination_tcp_port],
		},
		],
		"target-connection-group-id": "line1",
		}
		@@ -83,6 +106,22 @@ def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
		"type": "ietf-network-slice-service:vlan",
		"value": [dst_vlan],
		},
		{
		"type": "ietf-network-slice-service:source-ip-prefix",
		"value": [dst_source_ip_prefix],
		},
		{
		"type": "ietf-network-slice-service:source-tcp-port",
		"value": [dst_source_tcp_port],
		},
		{
		"type": "ietf-network-slice-service:destination-ip-prefix",
		"value": [dst_destination_ip_prefix],
		},
		{
		"type": "ietf-network-slice-service:destination-tcp-port",
		"value": [dst_destination_tcp_port],
		},
		],
		"target-connection-group-id": "line1",
		}
		@@ -108,8 +147,8 @@ def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
		"connectivity-construct": [
		{
		"id": 1,
		"p2mp-sender-sdp": "1",
		"p2mp-receiver-sdp": ["2"],
		"p2p-sender-sdp": "1",
		"p2p-receiver-sdp": "2",
		"service-slo-sle-policy": {
		"slo-policy": {
		"metric-bound": [
		@@ -134,8 +173,8 @@ def setup_config_rules(service_uuid: str, json_settings: Dict) -> List[Dict]:
		},
		{
		"id": 2,
		"p2mp-sender-sdp": "2",
		"p2mp-receiver-sdp": ["1"],
		"p2p-sender-sdp": "2",
		"p2p-receiver-sdp": "1",
		"service-slo-sle-policy": {
		"slo-policy": {
		"metric-bound": [

src/service/service/service_handlers/l3slice_ietfslice/L3SliceIETFSliceServiceHandler.py

+567 −417

File changed.

Preview size limit exceeded, changes collapsed.