Merge "Add ves-collector configuration"

diff --git a/solution/integration/smo/common/identity/authentication.json b/solution/integration/smo/common/identity/authentication.json
index bc4a5bc..0fd6e7d 100644 (file)
--- a/solution/integration/smo/common/identity/authentication.json
+++ b/solution/integration/smo/common/identity/authentication.json
@@ -79,38 +79,41 @@
     {
       "firstName": "Martin",
       "lastName": "Skorupski",
-      "email": "martin.skorupski@sdnr.onap.org",
+      "email": "martin.skorupski@highstreet-technologies.com",
       "enabled": "true",
       "username": "martin.skorupski",
       "credentials": [
         {
           "type": "password",
-          "value": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
-          "temporary": false
+          "value": "Default4SDN!",
+          "temporary": true
         }
+      ],
+      "requiredActions": [
+        "UPDATE_PASSWORD"
       ]
     }
   ],
   "grants": [
     {
-      "username":"leia.organa",
-      "role":"administration"
+      "username": "leia.organa",
+      "role": "administration"
     },
     {
-      "username":"r2.d2",
-      "role":"administration"
+      "username": "r2.d2",
+      "role": "administration"
     },
     {
-      "username":"luke.skywalker",
-      "role":"provision"
+      "username": "luke.skywalker",
+      "role": "provision"
     },
     {
-      "username":"jargo.fett",
-      "role":"supervision"
+      "username": "jargo.fett",
+      "role": "supervision"
     },
     {
-      "username":"martin.skorupski",
-      "role":"administration"
+      "username": "martin.skorupski",
+      "role": "administration"
     }
   ]
 }
\ No newline at end of file

diff --git a/solution/integration/smo/common/identity/o-ran-sc-realm.json b/solution/integration/smo/common/identity/o-ran-sc-realm.json
index 97d7b30..67b5bc2 100644 (file)
--- a/solution/integration/smo/common/identity/o-ran-sc-realm.json
+++ b/solution/integration/smo/common/identity/o-ran-sc-realm.json
@@ -1,8 +1,8 @@
 {
   "id": "onap",
   "realm": "onap",
-  "displayName": "O-RAN-SC SIM & OAM & NON-RT-RIC",
-  "displayNameHtml": "<div class=\"kc-logo-text\"><span>O-RAN-SC: SIM and OAM and Non-RT-RIC</span></div>",
+  "displayName": "O-RAN-SC OAM",
+  "displayNameHtml": "<div class=\"kc-logo-text\"><span>O-RAN-SC OAM</span></div>",
   "notBefore": 1606124502,
   "revokeRefreshToken": false,
   "refreshTokenMaxReuse": 0,
@@ -26,13 +26,13 @@
   "actionTokenGeneratedByUserLifespan": 300,
   "enabled": true,
   "sslRequired": "external",
-  "registrationAllowed": false,
+  "registrationAllowed": true,
   "registrationEmailAsUsername": false,
   "rememberMe": true,
   "verifyEmail": false,
   "loginWithEmailAllowed": true,
   "duplicateEmailsAllowed": false,
-  "resetPasswordAllowed": false,
+  "resetPasswordAllowed": true,
   "editUsernameAllowed": false,
   "bruteForceProtected": false,
   "permanentLockout": false,

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