89 files changed, 7 insertions, 7 deletions
diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml
index 7324fc1a..1581756d 100644
--- a/platform-logic/datachange/pom.xml
+++ b/platform-logic/datachange/pom.xml
@@ -36,7 +36,7 @@
                                 <resource>
                                     <directory>src/main/xml</directory>
                                     <includes>
-                                        <include>*.xml</include>
+                                        <include>**/*.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml
index f8e63f17..7ac1d80a 100644
--- a/platform-logic/generic-resource-api/pom.xml
+++ b/platform-logic/generic-resource-api/pom.xml
@@ -36,7 +36,7 @@
                                 <resource>
                                     <directory>src/main/xml</directory>
                                     <includes>
-                                        <include>*.xml</include>
+                                        <include>**/*.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
index 3a508656..3a508656 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
index bd279399..bd279399 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json
index c8e24f55..c8e24f55 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json
index 074dee31..074dee31 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-device-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-device-param.json
index 9d0c3722..9d0c3722 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-device-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-device-param.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.json
index 1db61c8c..1db61c8c 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-site-param.json
index 4224a324..4224a324 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-site-param.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
index 919c397a..919c397a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-wan-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
index dbd911b5..dbd911b5 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
index 3f7cbdc4..3f7cbdc4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json
index b7276f20..b7276f20 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
index b0c215aa..b0c215aa 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json
index 8e84a93f..8e84a93f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
index 1f43d75b..1f43d75b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
index 36a7cfdc..36a7cfdc 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json
index 116a08f0..116a08f0 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json
index 1a71611e..1a71611e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
index 12e88e0a..12e88e0a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json
index 5bbf0a49..5bbf0a49 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json
index af6f26c4..af6f26c4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
index bf71f28b..bf71f28b 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
index b04fe607..b04fe607 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
index e920aca2..e920aca2 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json
index 4d947bbf..4d947bbf 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json
index 739b68f0..739b68f0 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
index 463dc7f2..463dc7f2 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.json
index 3d6d6bc4..3d6d6bc4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
index bd24e0f2..bd24e0f2 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index d9c97e61..d9c97e61 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
index a0faa6a9..a0faa6a9 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
index 8b1fd281..8b1fd281 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.json
index f9a6bb1d..f9a6bb1d 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
index 0dac5d39..0dac5d39 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 2a7ca5e8..2a7ca5e8 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
index 41d183e8..41d183e8 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
index 2f29f7da..2f29f7da 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
index 6bdf1de6..6bdf1de6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.json
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
index f7ddb437..f7ddb437 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/sotn/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.json
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
index 01db6507..01db6507 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index 4ce82b1c..4ce82b1c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
index 6d679367..6d679367 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml
index 9f9121c8..9f9121c8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-device-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-device-param.xml
index c4bbca19..c4bbca19 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-device-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-device-param.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.xml
index d9bce9b6..d9bce9b6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-saved-ar-param.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
index c6147a0d..c6147a0d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
index 98d8bc9e..98d8bc9e 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
index 68980ec4..68980ec4 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index ffd5ee73..ffd5ee73 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
index 70500ccf..70500ccf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
index f2d0b1bf..f2d0b1bf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
index afd579de..afd579de 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-network-topology-operation-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
index 54bae832..54bae832 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
index ab122cc1..ab122cc1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
index d2a8129a..d2a8129a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
index de29db48..de29db48 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
index 720c1da2..720c1da2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
index a182dc54..a182dc54 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
index fa3d885f..fa3d885f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
index 9f9eb3b1..9f9eb3b1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
index d075c21d..d075c21d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
index 4c0e09f1..4c0e09f1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
index f431eb64..f431eb64 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
index 4f90141d..4f90141d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
index 38f118fc..38f118fc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.xml
index 478fe4d0..478fe4d0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-network-input-parameters.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index ef9278b9..ef9278b9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index ff7640d7..ff7640d7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 4626b3c3..4626b3c3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
index 3104c685..3104c685 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.xml
index 0aa82b73..0aa82b73 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-get-saved-ar-param.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
index bee22722..bee22722 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-activate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index af67bd68..af67bd68 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
index 53dae268..53dae268 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-deactivate.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
index 2eb6e767..2eb6e767 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-delete.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
index b49cb89f..b49cb89f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_sotn-network-topology-operation-reoptimize.xml
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
index 2669e641..2669e641 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sotn/GENERIC-RESOURCE-API_validate-sotn-network-input-parameters.xml
diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml
index f22fa0a3..b98fdec7 100644
--- a/platform-logic/lcm/pom.xml
+++ b/platform-logic/lcm/pom.xml
@@ -35,7 +35,7 @@
 								<resource>
 									<directory>src/main/xml</directory>
 									<includes>
-										<include>*.xml</include>
+										<include>**/*.xml</include>
 									</includes>
 									<filtering>true</filtering>
 								</resource>
diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml
index 2ffe2c26..8410f31d 100644
--- a/platform-logic/restapi-templates/pom.xml
+++ b/platform-logic/restapi-templates/pom.xml
@@ -36,14 +36,14 @@
                                 <resource>
                                     <directory>src/main/json</directory>
                                     <includes>
-                                        <include>*.json</include>
+                                        <include>**/*.json</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
                                 <resource>
                                     <directory>src/main/xml</directory>
                                     <includes>
-                                        <include>*.xml</include>
+                                        <include>**/*.xml</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml
index 0509f633..45b507a6 100644
--- a/platform-logic/restconfapi-yang/pom.xml
+++ b/platform-logic/restconfapi-yang/pom.xml
@@ -36,7 +36,7 @@
                                 <resource>
                                     <directory>src/main/yang</directory>
                                     <includes>
-                                        <include>*.yang</include>
+                                        <include>**/*.yang</include>
                                     </includes>
                                     <filtering>true</filtering>
                                 </resource>
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-subscribed-notifications.yang b/platform-logic/restconfapi-yang/src/main/yang/notification/ietf-subscribed-notifications.yang
index f7e01be5..f7e01be5 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-subscribed-notifications.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/notification/ietf-subscribed-notifications.yang
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-service@2018-03-01.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-service@2018-03-01.yang
index cb7c8f05..cb7c8f05 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-service@2018-03-01.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-service@2018-03-01.yang
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-types@2018-05-24.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-types@2018-05-24.yang
index 3775f36b..3775f36b 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-types@2018-05-24.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-types@2018-05-24.yang
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-inet-types.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-inet-types.yang
index c4033b80..c4033b80 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-inet-types.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-inet-types.yang
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-routing-types@2017-10-13.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-routing-types@2017-10-13.yang
index e33c4bc7..e33c4bc7 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-routing-types@2017-10-13.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-routing-types@2017-10-13.yang
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-te-types@2018-07-01.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-te-types@2018-07-01.yang
index 7a50210e..7a50210e 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-te-types@2018-07-01.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-te-types@2018-07-01.yang
diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-yang-types.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-yang-types.yang
index 5231f6a3..5231f6a3 100644
--- a/platform-logic/restconfapi-yang/src/main/yang/ietf-yang-types.yang
+++ b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-yang-types.yang
diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml
index a6eb9565..a5114f4c 100644
--- a/platform-logic/vnfapi/pom.xml
+++ b/platform-logic/vnfapi/pom.xml
@@ -35,7 +35,7 @@
 								<resource>
 									<directory>src/main/xml</directory>
 									<includes>
-										<include>*.xml</include>
+										<include>**/*.xml</include>
 									</includes>
 									<filtering>true</filtering>
 								</resource>