Merge changes from topic "OAM-279"

* changes:
  Add OAM-controller configuration
  Add OAM-controller configuration

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/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