Fixed DB scripts for Frankfurt

Issue-ID: PORTAL-854

Signed-off-by: Lorraine Welch <lb2391@att.com>
Change-Id: Ic7d37ecea2546f481f1fa00070746957c8e53091

8 files changed, 85 insertions, 40 deletions

diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_3_0_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_3_2_Common.sql
index 31d8be45..92ff2ad9 100644
--- a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_3_0_Common.sql
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDDLMySql_3_2_Common.sql
@@ -1,5 +1,5 @@
 -- ---------------------------------------------------------------------------------------------------------------
--- This script creates tables in the COMMON version 2.1.0 of the ONAP SDK application database.
+-- This script creates tables in the COMMON version 3.2.0 of the ONAP SDK application database.
 -- Additional DDL scripts may be required!
 --
 -- Note to database admin: set the MySQL system variable called lower_case_table_names to 1
@@ -472,7 +472,7 @@ create table fn_function (
     FUNCTION_NAME CHARACTER VARYING(50) NOT NULL,
     TYPE VARCHAR(20) NOT NULL,
     ACTION VARCHAR(20) NOT NULL,
-    UNIQUE KEY function (FUNCTION_CD,TYPE,ACTION)
+    UNIQUE KEY functcdtypeaction (FUNCTION_CD,TYPE,ACTION)
 );
 
 --
@@ -1389,4 +1389,4 @@ alter table cr_hist_user_map
 alter table cr_hist_user_map  
     add constraint sys_c0014617 foreign key (user_id) references fn_user(user_id);
     
-commit;
\ No newline at end of file
+commit;
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_3_0_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_3_2_Common.sql
index 94d0de8c..40e5f2ea 100644
--- a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_3_0_Common.sql
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkDMLMySql_3_2_Common.sql
@@ -1,5 +1,5 @@
 -- ---------------------------------------------------------------------------------------------------------------
--- This script populates tables in the COMMON version 2.1.0 of the ONAP SDK application database.
+-- This script populates tables in the COMMON version 3.2.0 of the ONAP SDK application database.
 -- Additional DML scripts may be required!
 -- ---------------------------------------------------------------------------------------------------------------
 
@@ -185,6 +185,7 @@ INSERT INTO fn_restricted_url VALUES('report/wizard/save_formfield_groups_data',
 INSERT INTO fn_restricted_url VALUES('report/wizard/save_col_tab_data/*','menu_reports');
 INSERT INTO fn_restricted_url VALUES('raptor/dashboard/run/*','menu_reports');
 
+insert into fn_restricted_url values ('v2','menu_home');
 
 -- fn_role
 Insert into fn_role (ROLE_ID,ROLE_NAME,ACTIVE_YN,PRIORITY) values (16,'Standard User','Y',5);
@@ -2899,4 +2900,4 @@ INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-
 INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-07','%Y-%m-%d'),61.86667);
 INSERT INTO demo_util_chart (TRAFFIC_DATE,UTIL_PERC ) VALUES (str_to_date('2016-03-08','%Y-%m-%d'),62.00000);
 
-commit;
\ No newline at end of file
+commit;
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_3_0_to_2_6_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_3_0_to_2_6_Common.sql
deleted file mode 100644
index f0a228df..00000000
--- a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_3_0_to_2_6_Common.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-use ecomp_sdk;
-
-SET FOREIGN_KEY_CHECKS=0;
-
-UPDATE fn_menu 
-SET ACTION='admin#/role_function_list'
-WHERE LABEL='Role Functions';
-
-
-UPDATE fn_menu 
-SET ACTION='admin#/usage_list'
-WHERE LABEL='Usage';
-
-
-UPDATE fn_menu 
-SET ACTION='admin#/admin'
-WHERE LABEL='Roles';
-
-UPDATE fn_menu 
-SET ACTION='admin#/jcs_admin'
-WHERE LABEL='Cache Admin';
-
-UPDATE fn_menu 
-SET ACTION='admin#/admin_menu_edit'
-WHERE LABEL='Menus';
-
-delete FROM fn_restricted_url WHERE RESTRICTED_URL='V2';
-
-commit;
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_3_2_to_2_6_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_3_2_to_2_6_Common.sql
new file mode 100644
index 00000000..1db43db8
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Rollback_3_2_to_2_6_Common.sql
@@ -0,0 +1,58 @@
+use ecomp_sdk;
+
+SET FOREIGN_KEY_CHECKS=0;
+
+UPDATE fn_menu 
+SET ACTION='welcome'
+WHERE LABEL='Home';
+
+UPDATE fn_menu 
+SET ACTION='userProfile#/self_profile'
+WHERE LABEL='Self';
+
+UPDATE fn_menu 
+SET ACTION='admin#/role_function_list'
+WHERE LABEL='Role Functions';
+
+
+UPDATE fn_menu 
+SET ACTION='admin#/usage_list'
+WHERE LABEL='Usage';
+
+
+UPDATE fn_menu 
+SET ACTION='admin#/admin'
+WHERE LABEL='Roles';
+
+UPDATE fn_menu 
+SET ACTION='admin#/jcs_admin'
+WHERE LABEL='Cache Admin';
+
+UPDATE fn_menu 
+SET ACTION='userProfile'
+WHERE LABEL='Search';
+
+UPDATE fn_menu 
+SET ACTION='admin#/admin_menu_edit'
+WHERE LABEL='Menus';
+
+-- fn_menu - update menu icon
+UPDATE fn_menu 
+SET `IMAGE_SRC`='icon-building-home' 
+WHERE  `LABEL`='Home';
+
+UPDATE fn_menu 
+SET `IMAGE_SRC`='icon-misc-piechart' 
+WHERE  `LABEL`='Reports';
+
+UPDATE fn_menu 
+SET `IMAGE_SRC`='icon-people-oneperson' 
+WHERE  `LABEL`='Profile';
+
+UPDATE fn_menu 
+SET `IMAGE_SRC`='icon-content-star' 
+WHERE  `LABEL`='Admin';
+
+delete FROM fn_restricted_url WHERE RESTRICTED_URL='V2';
+
+commit;
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_6_to_3_0_Common.sql b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_6_to_3_2_Common.sql
index 4139a7a5..16a408e4 100644
--- a/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_6_to_3_0_Common.sql
+++ b/ecomp-sdk/epsdk-app-common/db-scripts/EcompSdkMySql_Upgrade_2_6_to_3_2_Common.sql
@@ -3,7 +3,7 @@ use ecomp_sdk;
 SET FOREIGN_KEY_CHECKS=0;
 
 UPDATE fn_menu 
-SET ACTION='welcome'
+SET ACTION='v2/welcome'
 WHERE LABEL='Home';
 
 UPDATE fn_menu 
@@ -38,7 +38,6 @@ UPDATE fn_menu
 SET ACTION='v2/admin/admin_menu_edit'
 WHERE LABEL='Menus';
 
-
 -- fn_menu - update menu icon
 UPDATE fn_menu 
 SET `IMAGE_SRC`='icon ion-ios-home' 
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_3_0_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_3_2_OS.sql
index c0d1c721..cdf257b0 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_3_0_OS.sql
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDDLMySql_3_2_OS.sql
@@ -1,5 +1,5 @@
 -- ---------------------------------------------------------------------------------------------------------------
--- This script adds tables for the OPEN-SOURCE version 2.1.0 of the ECOMP SDK application database.
+-- This script adds tables for the OPEN-SOURCE version 3.2.0 of the ECOMP SDK application database.
 -- The DDL COMMON script must be executed first!
 -- ---------------------------------------------------------------------------------------------------------------
 
@@ -9,4 +9,4 @@ USE ecomp_sdk;
 
 -- No additional tables required at this time
 
-commit;
\ No newline at end of file
+commit;
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_0_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_2_OS.sql
index 174a4af6..ece1be3e 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_0_OS.sql
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_2_OS.sql
@@ -1,5 +1,5 @@
 -- ---------------------------------------------------------------------------------------------------------------
--- This script populates tables in the OPEN-SOURCE version 2.1.0 of the ECOMP SDK application database.
+-- This script populates tables in the OPEN-SOURCE version 3.2.0 of the ECOMP SDK application database.
 -- The DML COMMON script must be executed first!
 -- ---------------------------------------------------------------------------------------------------------------
 
@@ -53,4 +53,4 @@ Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_
 -- fn_user_role
 Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,null,1);
 
-commit;
\ No newline at end of file
+commit;
diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/readme b/ecomp-sdk/epsdk-app-os/db-scripts/readme
index 81944bb7..57b013c3 100644
--- a/ecomp-sdk/epsdk-app-os/db-scripts/readme
+++ b/ecomp-sdk/epsdk-app-os/db-scripts/readme
@@ -27,6 +27,11 @@ For ONAP Casablanca  instance run EcompSdkDDLMySql_2_4_common.sql and script Eco
 EcompSdkDDLMySql_2_4_Common.sql  - this is a common DDL file
 EcompSdkDDLMySql_2_4_OS.sql -  this is the specific DDL entries that only OS needs, empty placeholder
 
+For ONAP Frankfurt  instance run EcompSdkDDLMySql_3_2_common.sql and script EcompSdkDDLMySql_3_2_OS.sql.
+
+EcompSdkDDLMySql_3_2_Common.sql  - this is a common DDL file
+EcompSdkDDLMySql_3_2_OS.sql -  this is the specific DDL entries that only OS needs, empty placeholder
+
 DML
 For an ONAP Amsterdam instance run script EcompSdkDMLMySql_1710_Common.sql and script EcompSdkDMLMySql_1710_OS.sql.
 
@@ -38,6 +43,11 @@ For an ONAP Beijing instance run script EcompSdkDMLMySql_2_1_Common.sql and scri
 EcompSdkDMLMySql_2_1_Common.sql  - common DML entries 
 EcompSdkDMLMySql_2_1_OS.sql - DML entries for Opensource needs
 
+For an ONAP Frankfurt instance run script EcompSdkDMLMySql_3_2_Common.sql and script EcompSdkDMLMySql_3_2_OS.sql.
+
+EcompSdkDMLMySql_3_2_Common.sql  - common DML entries 
+EcompSdkDMLMySql_3_2_OS.sql - DML entries for Opensource needs
+
 For SDK Distribution 2.2 instance run script EcompSdkDMLMySql_2_2_Common.sql and script EcompSdkDMLMySql_2_2_OS.sql.
 
 EcompSdkDMLMySql_2_2_Common.sql  - common DML entries 
@@ -64,3 +74,9 @@ Our Existing Partner Apps can call the following scripts to upgrade from 2_1 to
 
 EcompSdkMySql_Upgrade_2_1_to_2_2_Common.sql
 EcompSdkMySql_Rollback_2_2_to_2_1_Common.sql
+
+Our Existing Partner Apps can call the following scripts to upgrade from 2_6 to 3_2 version
+/ecomp-sdk/epsdk-app-common/db-scripts
+EcompSdkMySql_Rollback_3_2_to_2_6_Common.sql
+EcompSdkMySql_Upgrade_2_6_to_3_2_Common.sql
+