summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-02-05 13:15:30 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-05 13:15:30 +0000
commitb4b88310c73f9faa15bbe8ad0ed6213660f6f52c (patch)
tree5ae70a71d3a200611da1f44901545f5be7fa1900
parent4fe55a9f53c156fd8f2103ea6ec81a4652d98d19 (diff)
parent41768c1ab468235e7c8b46faa83df26b41c66647 (diff)
Merge "create the flag FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF"
-rw-r--r--features.properties.md8
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/properties/Features.java1
-rw-r--r--vid-automation/src/main/java/vid/automation/test/infra/Features.java1
-rw-r--r--vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json3
-rw-r--r--vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts3
5 files changed, 14 insertions, 2 deletions
diff --git a/features.properties.md b/features.properties.md
index ce153b869..a0f7e2555 100644
--- a/features.properties.md
+++ b/features.properties.md
@@ -210,3 +210,11 @@
* FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO
On the "audit info" modal (available on Instantiation Status page), shows a link navigating to
the read-only RETRY page with more audit info.
+
+* FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY
+ When flag is true the user will be provided with edit permissions by owning entity id even the user have no permission by Subscriber,
+ when the flag is false the user provided with edit permission by Subscriber.
+
+* FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF
+ When flag is true new VF Modules on Alacarte service will inherit LCP-Region and Tenant from parent VNF.
+ When off, user is requested to specify LCP-Region and Tenant for each VF Module. \ No newline at end of file
diff --git a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
index 27190466d..cc3fad65e 100644
--- a/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
+++ b/vid-app-common/src/main/java/org/onap/vid/properties/Features.java
@@ -86,6 +86,7 @@ public enum Features implements Feature {
FLAG_2002_UNLIMITED_MAX,
FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO,
FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY,
+ FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF,
;
diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
index 55b7b3fd0..ddf0baddb 100644
--- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java
+++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java
@@ -59,6 +59,7 @@ public enum Features implements Feature {
FLAG_2004_INSTANTIATION_TEMPLATES_POPUP,
FLAG_2006_VFM_SDNC_PRELOAD_FILES,
FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY,
+ FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF,
;
public boolean isActive() {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json
index e2b9d8ad7..d9602d139 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.cypress.json
@@ -23,5 +23,6 @@
"FLAG_2004_INSTANTIATION_TEMPLATES_POPUP" : false,
"FLAG_2002_UNLIMITED_MAX" : true,
"FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE": true,
- "FLAG_2006_VFM_SDNC_PRELOAD_FILES" : true
+ "FLAG_2006_VFM_SDNC_PRELOAD_FILES" : true,
+ "FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF": true
}
diff --git a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
index 722deca99..5842662fb 100644
--- a/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
+++ b/vid-webpack-master/src/app/shared/services/featureFlag/feature-flags.service.ts
@@ -18,7 +18,8 @@ export enum Features {
FLAG_2006_VFM_SDNC_PRELOAD_FILES = 'FLAG_2006_VFM_SDNC_PRELOAD_FILES',
FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO = 'FLAG_MORE_AUDIT_INFO_LINK_ON_AUDIT_INFO',
FLAG_2004_INSTANTIATION_TEMPLATES_POPUP = 'FLAG_2004_INSTANTIATION_TEMPLATES_POPUP',
- FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY= 'FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY'
+ FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY= 'FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY',
+ FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF = 'FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF',
}
@Injectable()