Merge "Fixed JAVA keystore file name"

Former-commit-id: fbe0c6a35ec007621e52e1bedb278e5e718f3862

16 files changed, 50 insertions, 50 deletions

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 54585562..b3e2b210 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -402,7 +402,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="token-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -427,7 +427,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="vpn-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -451,7 +451,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="put" />

                             <parameter name="responsePrefix" value="vrf-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -475,7 +475,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="site-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index a6392bad..06240451 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
@@ -145,7 +145,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

                             <parameter name="responsePrefix" value="token-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -169,7 +169,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="delete" />

                             <parameter name="responsePrefix" value="site-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -192,7 +192,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="delete" />

                             <parameter name="responsePrefix" value="vrf1-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -215,7 +215,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="delete" />

                             <parameter name="responsePrefix" value="vrf2-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

@@ -238,7 +238,7 @@
                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="delete" />

                             <parameter name="responsePrefix" value="vpn-result" />

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks" />

                             <parameter name="trustStorePassword" value="adminadmin" />

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />

                             <parameter name="keyStorePassword" value="adminadmin" />

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/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
index c54ff02a..df80e2dd 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/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-activate.xml
@@ -302,7 +302,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -355,7 +355,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="tenant-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -369,7 +369,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="vpn-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -393,7 +393,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="vpn-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
index 2d10d4e3..180d3179 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/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-deactivate.xml
@@ -343,7 +343,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -396,7 +396,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="tenant-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -411,7 +411,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="vpn-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -435,7 +435,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="vpn-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
index 64885828..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/GENERIC-RESOURCE-API_sdwan-get-tenant-auth.xml
@@ -39,7 +39,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="put"/>

                 <parameter name="responsePrefix" value="tenant-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
index 553852d3..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/GENERIC-RESOURCE-API_sdwan-network-topology-operation-activate.xml
@@ -65,7 +65,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -111,7 +111,7 @@
                                     <parameter name="format" value="json"/>

                                     <parameter name="httpMethod" value="post"/>

                                     <parameter name="responsePrefix" value="tenant-result"/>

-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                     <parameter name="trustStorePassword" value="adminadmin"/>

                                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                     <parameter name="keyStorePassword" value="adminadmin"/>

@@ -134,7 +134,7 @@
                                     <parameter name="format" value="json"/>

                                     <parameter name="httpMethod" value="put"/>

                                     <parameter name="responsePrefix" value="tenant-result"/>

-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                     <parameter name="trustStorePassword" value="adminadmin"/>

                                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                     <parameter name="keyStorePassword" value="adminadmin"/>

@@ -154,7 +154,7 @@
                                     <parameter name="format" value="json"/>

                                     <parameter name="httpMethod" value="put"/>

                                     <parameter name="responsePrefix" value="tenant-result"/>

-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                     <parameter name="trustStorePassword" value="adminadmin"/>

                                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                     <parameter name="keyStorePassword" value="adminadmin"/>

@@ -181,7 +181,7 @@
                     <parameter name="format" value="json"/>

                     <parameter name="httpMethod" value="put"/>

                     <parameter name="responsePrefix" value="orchestration-result"/>

-                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                     <parameter name="trustStorePassword" value="adminadmin"/>

                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                     <parameter name="keyStorePassword" value="adminadmin"/>

@@ -197,7 +197,7 @@
                     <parameter name="format" value="json"/>

                     <parameter name="httpMethod" value="post"/>

                     <parameter name="responsePrefix" value="vpn-result"/>

-                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                     <parameter name="trustStorePassword" value="adminadmin"/>

                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                     <parameter name="keyStorePassword" value="adminadmin"/>

@@ -215,7 +215,7 @@
                     <parameter name="format" value="json"/>

                     <parameter name="httpMethod" value="post"/>

                     <parameter name="responsePrefix" value="vpn-result"/>

-                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                     <parameter name="trustStorePassword" value="adminadmin"/>

                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                     <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
index abbe0898..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/GENERIC-RESOURCE-API_sdwan-network-topology-operation-deactivate.xml
@@ -79,7 +79,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -115,7 +115,7 @@
                                     <parameter name="format" value="json"/>

                                     <parameter name="httpMethod" value="put"/>

                                     <parameter name="responsePrefix" value="tenant-result"/>

-                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                     <parameter name="trustStorePassword" value="adminadmin"/>

                                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                     <parameter name="keyStorePassword" value="adminadmin"/>

@@ -140,7 +140,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="delete"/>

                 <parameter name="responsePrefix" value="vpn-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -154,7 +154,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="vpn-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
index cb02af60..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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.xml
@@ -74,7 +74,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -96,7 +96,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="deviceResp"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
index 9ded93e9..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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-deactivate.xml
@@ -67,7 +67,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -95,7 +95,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="delete"/>

                 <parameter name="responsePrefix" value="deviceResp"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
index 0116dac2..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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-activate.xml
@@ -175,7 +175,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -201,7 +201,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="portResp"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -227,7 +227,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="get"/>

                 <parameter name="responsePrefix" value="transportNetworksResp"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

@@ -279,7 +279,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="wanPortResp"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
index bf5d4af1..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/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-wanport-deactivate.xml
@@ -87,7 +87,7 @@
                 <parameter name="format" value="json"/>

                 <parameter name="httpMethod" value="post"/>

                 <parameter name="responsePrefix" value="token-result"/>

-                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                 <parameter name="trustStorePassword" value="adminadmin"/>

                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                 <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
index 290426ba..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/GENERIC-RESOURCE-API_sdwan-wanport-vnf-topology-operation-underlay.xml
@@ -512,7 +512,7 @@
                                                                                             <parameter name="format" value="json"/>

                                                                                             <parameter name="httpMethod" value="post"/>

                                                                                             <parameter name="responsePrefix" value="underlayHubResp"/>

-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                                                                             <parameter name="trustStorePassword" value="adminadmin"/>

                                                                                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                                                                             <parameter name="keyStorePassword" value="adminadmin"/>

@@ -544,7 +544,7 @@
                                                                                             <parameter name="format" value="json"/>

                                                                                             <parameter name="httpMethod" value="post"/>

                                                                                             <parameter name="responsePrefix" value="underlayspokeResp"/>

-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                                                                             <parameter name="trustStorePassword" value="adminadmin"/>

                                                                                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                                                                             <parameter name="keyStorePassword" value="adminadmin"/>

@@ -613,7 +613,7 @@
                                                                                             <parameter name="format" value="json"/>

                                                                                             <parameter name="httpMethod" value="post"/>

                                                                                             <parameter name="responsePrefix" value="underlayHubResp"/>

-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                                                                             <parameter name="trustStorePassword" value="adminadmin"/>

                                                                                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                                                                             <parameter name="keyStorePassword" value="adminadmin"/>

@@ -646,7 +646,7 @@
                                                                                             <parameter name="format" value="json"/>

                                                                                             <parameter name="httpMethod" value="post"/>

                                                                                             <parameter name="responsePrefix" value="underlayspokeResp"/>

-                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                                                                             <parameter name="trustStorePassword" value="adminadmin"/>

                                                                                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                                                                             <parameter name="keyStorePassword" value="adminadmin"/>

@@ -751,7 +751,7 @@
                         <parameter name="format" value="json"/>

                         <parameter name="httpMethod" value="post"/>

                         <parameter name="responsePrefix" value="provisionUrlRsp"/>

-                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                         <parameter name="trustStorePassword" value="adminadmin"/>

                         <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                         <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
index 3fc0bc7f..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/GENERIC-RESOURCE-API_site-vnf-topology-operation-activate.xml
@@ -154,7 +154,7 @@
                             <parameter name="format" value="json"/>

                             <parameter name="httpMethod" value="post"/>

                             <parameter name="responsePrefix" value="token-result"/>

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                             <parameter name="trustStorePassword" value="adminadmin"/>

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                             <parameter name="keyStorePassword" value="adminadmin"/>

@@ -176,7 +176,7 @@
                             <parameter name="format" value="json"/>

                             <parameter name="httpMethod" value="post"/>

                             <parameter name="responsePrefix" value="site-result"/>

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                             <parameter name="trustStorePassword" value="adminadmin"/>

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                             <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
index de4d052d..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/GENERIC-RESOURCE-API_site-vnf-topology-operation-deactivate.xml
@@ -124,7 +124,7 @@
                             <parameter name="format" value="json"/>

                             <parameter name="httpMethod" value="post"/>

                             <parameter name="responsePrefix" value="token-result"/>

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                             <parameter name="trustStorePassword" value="adminadmin"/>

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                             <parameter name="keyStorePassword" value="adminadmin"/>

@@ -146,7 +146,7 @@
                             <parameter name="format" value="json"/>

                             <parameter name="httpMethod" value="post"/>

                             <parameter name="responsePrefix" value="site-result"/>

-                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                             <parameter name="trustStorePassword" value="adminadmin"/>

                             <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                             <parameter name="keyStorePassword" value="adminadmin"/>

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/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
index 9e0e96c6..28f3b757 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/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml
@@ -358,7 +358,7 @@
                                 <parameter name="format" value="json"/>
                                 <parameter name="httpMethod" value="post"/>
                                 <parameter name="responsePrefix" value="oof"/>
-                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                 <parameter name="trustStorePassword" value="adminadmin"/>
                                 <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
                                 <parameter name="keyStorePassword" value="adminadmin"/>
@@ -439,7 +439,7 @@
                                         <parameter name="format" value="json"/>
                                         <parameter name="httpMethod" value="patch"/>
                                         <parameter name="responsePrefix" value="vpn-result"/>
-                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>
+                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                         <parameter name="trustStorePassword" value="adminadmin"/>
                                         <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
                                         <parameter name="keyStorePassword" value="adminadmin"/>
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/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
index 5452fc8e..9fc30e6b 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/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-deactivate.xml
@@ -282,7 +282,7 @@
                                                         <parameter name="format" value="json"/>

                                                         <parameter name="httpMethod" value="delete"/>

                                                         <parameter name="responsePrefix" value="vpn-result"/>

-                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks"/>

+                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>

                                                         <parameter name="trustStorePassword" value="adminadmin"/>

                                                         <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>

                                                         <parameter name="keyStorePassword" value="adminadmin"/>