# Conflicts:
#	src/policy/src/main/java/org/etsi/tfs/policy/PolicyServiceImpl.java
#	src/policy/target/kubernetes/kubernetes.yml

Resolve "(UBI) Unit Tests for Policy component"

Closes #111

See merge request !201

# Conflicts:
#	src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
#	src/policy/target/kubernetes/kubernetes.yml

Resolve "(CTTC) Multiple Bugs related to F5G PoC CAMARA experiment"

Closes #120

See merge request !204

- Fixed config rule validation by ignoring mgmt endpoints

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/120-cttc-multiple-bugs-related-to-f5g-poc-camara-experiment

- Fixed README
- Fixed script run paths

- Enabled creation of multiple services at once

Resolve "(TID) Fix add device get queries"

Closes #119

See merge request !203

Merge branch 'feat/91-cttc-implement-service-handler-for-l3-services-using-actn-sbi-driver' into 'develop'

Resolve "(CTTC) Implement Service Handler for L3 services using ACTN SBI driver"

Closes #91

See merge request !199

- Added test instructions and example descriptor.

- Added missing device type filters

- Implemented rule composition
- Added missing python requirement

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/91-cttc-implement-service-handler-for-l3-services-using-actn-sbi-driver

- Updated service endpoint settings custom resource key to /device/endpoint/settings
- Corrected test files

- Fixed signature of method GetDevice()

- Added method generate_neighbor_endpoint_config_rules to compose config rules for neighbor endpoints

- Extended ComposeConfigRules to propagate static routes in L3 services
- Extended ComposeConfigRules to recognize custom config rules with the form /device[]/endpoint[]/vlan[]/settings

- Added missing data files
- Updated test files
- Corrected config rules to store address of neighbor devices

- Extended method to manage Constraints to enable specifying a new action

- Corrected unitary test data files

- Added logic to store in Context the explicit controller of a device

- Added IP SDN Ctrl as a packet device in sub-service composer and resource groups
- Added logic to separate connections managed by intermediate SDN controllers

- Added device type IP SDN Controller
- Added logic to split controllers and devices
- Controllers are onboarded first, then devices