Merge "Add common docker-compose.yml"

diff --git a/solution/integration/smo/oam/sdnr/oauth-aaa-app-config.xml b/solution/integration/smo/oam/sdnr/oauth-aaa-app-config.xml
index 28a79f6..15bc953 100644 (file)
--- a/solution/integration/smo/oam/sdnr/oauth-aaa-app-config.xml
+++ b/solution/integration/smo/oam/sdnr/oauth-aaa-app-config.xml
@@ -40,11 +40,11 @@
     </main>
     <main>
         <pair-key>anyroles</pair-key>
-        <pair-value>org.opendaylight.aaa.shiro.filters.AnyRoleHttpAuthenticationFilter</pair-value>
+        <pair-value>org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters.AnyRoleHttpAuthenticationFilter</pair-value>
     </main>
     <main>
         <pair-key>authcBearer</pair-key>
-        <pair-value>org.opendaylight.aaa.shiro.filters.ODLHttpAuthenticationFilter2</pair-value>
+        <pair-value>org.onap.ccsdk.features.sdnr.wt.oauthprovider.filters.BearerAndBasicHttpAuthenticationFilter</pair-value>
     </main>
 
     <!-- in order to track AAA challenge attempts -->

diff --git a/solution/operation-and-maintenance/network b/solution/operation-and-maintenance/network
new file mode 120000 (symlink)
index 0000000..659ef45
--- /dev/null
+++ b/solution/operation-and-maintenance/network
@@ -0,0 +1 @@
+../integration/network
\ No newline at end of file

diff --git a/solution/operation-and-maintenance/smo/common/dmaap b/solution/operation-and-maintenance/smo/common/dmaap
new file mode 120000 (symlink)
index 0000000..afa9404
--- /dev/null
+++ b/solution/operation-and-maintenance/smo/common/dmaap
@@ -0,0 +1 @@
+../../../integration/smo/common/dmaap
\ No newline at end of file

diff --git a/solution/operation-and-maintenance/smo/common/docker b/solution/operation-and-maintenance/smo/common/docker
new file mode 120000 (symlink)
index 0000000..9a61863
--- /dev/null
+++ b/solution/operation-and-maintenance/smo/common/docker
@@ -0,0 +1 @@
+../../../integration/smo/common/docker
\ No newline at end of file

diff --git a/solution/operation-and-maintenance/smo/common/kafka b/solution/operation-and-maintenance/smo/common/kafka
new file mode 120000 (symlink)
index 0000000..1a07bf4
--- /dev/null
+++ b/solution/operation-and-maintenance/smo/common/kafka
@@ -0,0 +1 @@
+../../../integration/smo/common/kafka
\ No newline at end of file

diff --git a/solution/operation-and-maintenance/smo/common/zookeeper b/solution/operation-and-maintenance/smo/common/zookeeper
new file mode 120000 (symlink)
index 0000000..b2480bd
--- /dev/null
+++ b/solution/operation-and-maintenance/smo/common/zookeeper
@@ -0,0 +1 @@
+../../../integration/smo/common/zookeeper
\ No newline at end of file

diff --git a/solution/operation-and-maintenance/smo/oam/controller b/solution/operation-and-maintenance/smo/oam/controller
new file mode 120000 (symlink)
index 0000000..90679fa
--- /dev/null
+++ b/solution/operation-and-maintenance/smo/oam/controller
@@ -0,0 +1 @@
+../../../integration/smo/oam/sdnr
\ No newline at end of file

diff --git a/solution/operation-and-maintenance/smo/oam/web b/solution/operation-and-maintenance/smo/oam/web
new file mode 120000 (symlink)
index 0000000..3eb687d
--- /dev/null
+++ b/solution/operation-and-maintenance/smo/oam/web
@@ -0,0 +1 @@
+../../../integration/smo/oam/sdnc-web
\ No newline at end of file