From: Alexey Sandler Date: Wed, 5 Feb 2020 11:32:27 +0000 (+0200) Subject: create the flag FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF X-Git-Tag: 6.0.3~55^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vid.git;a=commitdiff_plain;h=41768c1ab468235e7c8b46faa83df26b41c66647 create the flag FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF Issue-ID: VID-758 Signed-off-by: Alexey Sandler Change-Id: I149df1c6b1245542a6083c8cdec7ea3bbb50e933 Signed-off-by: Alexey Sandler --- 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()