From e2a7abb45b953d405fc5aa1917f74e2da9f188c0 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Tue, 18 Feb 2020 16:58:16 +0200 Subject: VNF's LCP regions found by Line-of-business (and owning-entity) Depends on FLAG_2006_LCP_REGIONS_BY_LINE_OF_BUSINESS Issue-ID: VID-758 Change-Id: I7b5a67202a72fc6ea4afe0a5c1c60657c93bf690 Signed-off-by: Alexey Sandler Signed-off-by: Ittay Stern --- .../app/shared/services/aaiService/aai.service.ts | 48 +++++++++++++++++++++- .../services/featureFlag/feature-flags.service.ts | 2 + 2 files changed, 49 insertions(+), 1 deletion(-) (limited to 'vid-webpack-master/src/app/shared/services') diff --git a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts index 9026a5648..603ba814d 100644 --- a/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts +++ b/vid-webpack-master/src/app/shared/services/aaiService/aai.service.ts @@ -29,7 +29,14 @@ import {VnfInstance} from "../../models/vnfInstance"; import {VfModuleInstance} from "../../models/vfModuleInstance"; import {ServiceInstance} from "../../models/serviceInstance"; import {VfModuleMap} from "../../models/vfModulesMap"; -import {updateAicZones, updateCategoryParameters, updateLcpRegionsAndTenants, updateServiceTypes, updateSubscribers, updateUserId} from "../../storeUtil/utils/general/general.actions"; +import { + updateAicZones, + updateCategoryParameters, + updateLcpRegionsAndTenants, + updateServiceTypes, + updateSubscribers, + updateUserId +} from "../../storeUtil/utils/general/general.actions"; import {createServiceInstance, updateModel,} from "../../storeUtil/utils/service/service.actions"; import {FeatureFlagsService, Features} from "../featureFlag/feature-flags.service"; import {VnfMember} from "../../models/VnfMember"; @@ -221,6 +228,45 @@ export class AaiService { cloudRegionId+AaiService.formatCloudOwnerTrailer(cloudOwner) : cloudRegionId; }; + + + + + getLcpRegionsByOwningEntityAndLineOfBusiness = (owningEntityName, lineOfBusinessName): Observable => { + // let pathQuery: string = Constants.Path.AAI_GET_LCP_REGIONS_BY____ + // + "?" + // + "owningEntityName=" + owningEntityName + // + "lineOfBusinessName=" + lineOfBusinessName; + + return of([ + new LcpRegion("foo-id", "foo-name", true, "foo-cloud-owner"), + new LcpRegion("foo2-id", "foo2-name", true, "foo2-cloud-owner"), + ]); + }; + + + getTenantsByCloudOwnerAndCloudRegionId = (cloudOwner, cloudRegionId): Observable => { + // let pathQuery: string = Constants.Path.AAI_GET_TENANTS_BY____ + // + "?" + // + "cloudOwner=" + cloudOwner + // + "&cloudRegionId=" + cloudRegionId; + + return of([ + new Tenant({ + tenantID: "tenantID", tenantName: "tenantName", + cloudOwner: "cloudOwner", ['is-permitted']: true, + }), + new Tenant({ + tenantID: "tenant2ID", tenantName: "tenant2Name", + cloudOwner: "cloudOwner", ['is-permitted']: true, + }), + ]) + }; + + + + + public static formatCloudOwnerTrailer(cloudOwner: string):string { return " ("+ cloudOwner.trim().toLowerCase().replace(/^[^-]*-/, "").toUpperCase() + ")"; } 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 5842662fb..2c30d9385 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 @@ -13,12 +13,14 @@ export enum Features { FLAG_FLASH_REPLACE_VF_MODULE ='FLAG_FLASH_REPLACE_VF_MODULE', FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT ='FLAG_FLASH_MORE_ACTIONS_BUTTON_IN_OLD_VIEW_EDIT', FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS ='FLAG_2002_VFM_UPGRADE_ADDITIONAL_OPTIONS', + FLAG_2002_VNF_PLATFORM_MULTI_SELECT= 'FLAG_2002_VNF_PLATFORM_MULTI_SELECT', FLAG_2004_INSTANTIATION_STATUS_FILTER ='FLAG_2004_INSTANTIATION_STATUS_FILTER', FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE = 'FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE', 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_LCP_REGIONS_BY_LINE_OF_BUSINESS = 'FLAG_2006_LCP_REGIONS_BY_LINE_OF_BUSINESS', FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF = 'FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF', } -- cgit 1.2.3-korg