summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdeliveries/pom.xml2
-rwxr-xr-xepsdk-app-onap/pom.xml2
-rwxr-xr-xepsdk-app-onap/src/main/resources/vid-data.sql13
-rw-r--r--epsdk-app-onap/version.properties2
-rw-r--r--pom.xml4
-rw-r--r--version.properties2
-rwxr-xr-xvid-app-common/pom.xml2
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java8
-rwxr-xr-xvid-app-common/version.properties2
10 files changed, 26 insertions, 15 deletions
diff --git a/deliveries/pom.xml b/deliveries/pom.xml
index 7b7e6ab3..ccd9f123 100755
--- a/deliveries/pom.xml
+++ b/deliveries/pom.xml
@@ -62,7 +62,7 @@
<descriptor>assembly/assembly-for-plugin.xml</descriptor>
</assembly>
<tags>
- <tag>3.1-STAGING-latest</tag>
+ <tag>3.2-STAGING-latest</tag>
<tag>latest</tag>
</tags>
diff --git a/epsdk-app-onap/pom.xml b/epsdk-app-onap/pom.xml
index 4c655c7a..7d928670 100755
--- a/epsdk-app-onap/pom.xml
+++ b/epsdk-app-onap/pom.xml
@@ -8,7 +8,7 @@
the Portal team. -->
<groupId>org.onap.vid</groupId>
<artifactId>epsdk-app-onap</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>ECOMP SDK Webapp for OpenSource</name>
<description>ECOMP SDK Web Application for public release</description>
diff --git a/epsdk-app-onap/src/main/resources/vid-data.sql b/epsdk-app-onap/src/main/resources/vid-data.sql
index e2af216e..9c48f853 100755
--- a/epsdk-app-onap/src/main/resources/vid-data.sql
+++ b/epsdk-app-onap/src/main/resources/vid-data.sql
@@ -625,6 +625,12 @@ REPLACE INTO `fn_restricted_url` VALUES ('serviceModels.htm','menu_servicemodels
--
INSERT INTO `fn_role` VALUES (1,'System Administrator','Y',1) ON DUPLICATE KEY UPDATE ROLE_NAME='System Administrator', ACTIVE_YN='Y', PRIORITY=1;
INSERT INTO `fn_role` VALUES (16,'Standard User','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Standard User', ACTIVE_YN='Y', PRIORITY=5;
+INSERT INTO `fn_role` VALUES (17,'Demonstration___vFWCL','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Demonstration___vFWCL', ACTIVE_YN='Y', PRIORITY=5;
+INSERT INTO `fn_role` VALUES (18,'Demonstration___vFW','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Demonstration___vFW', ACTIVE_YN='Y', PRIORITY=5;
+INSERT INTO `fn_role` VALUES (19,'Demonstration___vCPE','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Demonstration___vCPE', ACTIVE_YN='Y', PRIORITY=5;
+INSERT INTO `fn_role` VALUES (20,'Demonstration___vIMS','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Demonstration___vIMS', ACTIVE_YN='Y', PRIORITY=5;
+INSERT INTO `fn_role` VALUES (21,'Demonstration___vLB','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Demonstration___vLB', ACTIVE_YN='Y', PRIORITY=5;
+INSERT INTO `fn_role` VALUES (22,'Demonstration___gNB','Y',5) ON DUPLICATE KEY UPDATE ROLE_NAME='Demonstration___gNB', ACTIVE_YN='Y', PRIORITY=5;
--
-- Dumping data for table `fn_role_composite`
@@ -735,3 +741,10 @@ INSERT IGNORE `fn_user_role` VALUES (2,1,NULL,1);
INSERT IGNORE `fn_user_role` VALUES (3,1,NULL,1);
INSERT IGNORE `fn_user_role` VALUES (4,1,NULL,1);
INSERT IGNORE `fn_user_role` VALUES (5,1,NULL,1);
+INSERT IGNORE `fn_user_role` VALUES (1,17,NULL,1);
+INSERT IGNORE `fn_user_role` VALUES (1,18,NULL,1);
+INSERT IGNORE `fn_user_role` VALUES (1,19,NULL,1);
+INSERT IGNORE `fn_user_role` VALUES (1,20,NULL,1);
+INSERT IGNORE `fn_user_role` VALUES (1,21,NULL,1);
+INSERT IGNORE `fn_user_role` VALUES (1,22,NULL,1);
+
diff --git a/epsdk-app-onap/version.properties b/epsdk-app-onap/version.properties
index 0470dc6a..d2c374d1 100644
--- a/epsdk-app-onap/version.properties
+++ b/epsdk-app-onap/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=3
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/pom.xml b/pom.xml
index cfab5276..080bce81 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,7 +80,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <build.version>3.1.0-SNAPSHOT</build.version>
+ <build.version>3.2.0-SNAPSHOT</build.version>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
@@ -268,5 +268,5 @@
<version>4.5.3</version>
</dependency>
</dependencies>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
</project>
diff --git a/version.properties b/version.properties
index 0470dc6a..d2c374d1 100644
--- a/version.properties
+++ b/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=3
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}
diff --git a/vid-app-common/pom.xml b/vid-app-common/pom.xml
index c9c32ac9..f2c7f0c3 100755
--- a/vid-app-common/pom.xml
+++ b/vid-app-common/pom.xml
@@ -9,7 +9,7 @@
inherit from a parent maven module. -->
<groupId>org.onap.vid</groupId>
<artifactId>vid-app-common</artifactId>
- <version>3.1.0-SNAPSHOT</version>
+ <version>3.2.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>VID Common</name>
<description>VID Common code for opensource version</description>
diff --git a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java
index 6d6ffb31..3a3acd8e 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controllers/VidController.java
@@ -106,9 +106,7 @@ public class VidController extends RestrictedBaseController {
SecureServices secureServices = new SecureServices();
List<Role> roles = roleProvider.getUserRoles(request);
secureServices.setServices(aaiService.getServicesByDistributionStatus());
- //Disable roles until AAF integration finishes
- //secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles));
- secureServices.setReadOnly(false);
+ secureServices.setReadOnly(roleProvider.userPermissionIsReadOnly(roles));
return secureServices;
}
catch (Exception t) {
diff --git a/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java b/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java
index 45835d45..b268c98c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java
+++ b/vid-app-common/src/main/java/org/onap/vid/roles/RoleProvider.java
@@ -51,10 +51,10 @@ public class RoleProvider {
LOG.debug(EELFLoggerDelegate.debugLogger, logPrefix + "Entering to get user role for user " + UserUtils.getUserId(request));
List<Role> roleList = new ArrayList<>();
- //Disable roles until AAF integration finishes
- /*HashMap roles = UserUtils.getRoles(request);
+
+ Map roles = UserUtils.getRoles(request);
for (Object role : roles.keySet()) {
- org.openecomp.portalsdk.core.domain.Role sdkRol = (org.openecomp.portalsdk.core.domain.Role) roles.get(role);
+ org.onap.portalsdk.core.domain.Role sdkRol = (org.onap.portalsdk.core.domain.Role) roles.get(role);
LOG.debug(EELFLoggerDelegate.debugLogger, logPrefix + "Role " + sdkRol.getName() + " is being proccessed");
try {
@@ -71,7 +71,7 @@ public class RoleProvider {
LOG.error(logPrefix + " Failed to parse permission");
}
- }*/
+ }
return roleList;
}
diff --git a/vid-app-common/version.properties b/vid-app-common/version.properties
index 0470dc6a..d2c374d1 100755
--- a/vid-app-common/version.properties
+++ b/vid-app-common/version.properties
@@ -3,7 +3,7 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=3
-minor=1
+minor=2
patch=0
base_version=${major}.${minor}.${patch}