diff options
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree')
3 files changed, 24 insertions, 344 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts index 7475c77c7..2e04f53bb 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.component.ts @@ -134,7 +134,13 @@ export class AvailableModelsTreeComponent { this.highlightInstances.emit(node.data.modelUniqueId); if (FeatureFlagsService.getFlagState(Features.FLAG_1906_COMPONENT_INFO, this.store)) { const serviceHierarchy = this._store.getState().service.serviceHierarchy[this.serviceModelId]; - const model = node.data.getModel(node.data.name, node.data, serviceHierarchy); + + const instanceModel = this._sharedTreeService.modelByIdentifiers( + serviceHierarchy, node.data.modelTypeName, + this._sharedTreeService.modelUniqueNameOrId(node.data), node.data.name + ); + + const model = node.data.getModel(instanceModel); const modelInfoItems = node.data.getInfo(model, null); const componentInfoModel :ComponentInfoModel = this._sharedTreeService.addGeneralInfoItems(modelInfoItems, node.data.componentInfoType, model, null); ComponentInfoService.triggerComponentInfoChange.next(componentInfoModel); diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.spec.ts index 4abc20324..6a101d3d2 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.spec.ts @@ -14,6 +14,7 @@ describe('Available Models Tree Service', () => { let injector; let service: AvailableModelsTreeService; let httpMock: HttpTestingController; + let sharedTreeService: SharedTreeService; beforeAll(done => (async () => { TestBed.configureTestingModule({ @@ -27,6 +28,7 @@ describe('Available Models Tree Service', () => { injector = getTestBed(); service = injector.get(AvailableModelsTreeService); httpMock = injector.get(HttpTestingController); + sharedTreeService = injector.get(SharedTreeService); })().then(done).catch(done.fail)); @@ -47,7 +49,6 @@ describe('Available Models Tree Service', () => { describe('#shouldOpenModalDialogOnAddInstance', () => { - let serviceHierarchy = getServiceServiceHierarchy(); test('should open popup on add instance', () => { // add vnf should return true @@ -99,6 +100,8 @@ describe('Available Models Tree Service', () => { "isEcompGeneratedNaming": false, "typeName": "VRF", "componentInfoType": "VRF", + "data": { + }, "getModel" : ()=>{ return { min : 1 @@ -108,6 +111,9 @@ describe('Available Models Tree Service', () => { const serviceStore = { + "serviceHierarchy": { + "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc": {} + }, "serviceInstance": { "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc": { "action": "Create", @@ -158,7 +164,7 @@ describe('Available Models Tree Service', () => { "physicalName": "sriovnet0", "instanceId": "46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7", "serviceName": "LPPVPN", - "serv§iceUUID": "VPN1271", + "serviceUUID": "VPN1271", "tenantName": "ecomp_ispt", "lcpCloudRegionId": "USA,EMEA", "modelInfo": { @@ -221,6 +227,8 @@ describe('Available Models Tree Service', () => { } }; + spyOn(sharedTreeService, 'modelByIdentifiers').and.returnValue({}); + const serviceModelId :string = '4117a0b6-e234-467d-b5b9-fe2f68c8b0fc'; let result: boolean = service.shouldOpenVRFModal(nodes, serviceModelId, serviceStore); @@ -235,344 +243,4 @@ describe('Available Models Tree Service', () => { }); - function getServiceServiceHierarchy() { - return JSON.parse(JSON.stringify( - { - '6e59c5de-f052-46fa-aa7e-2fca9d674c44': { - 'service': { - 'uuid': '6e59c5de-f052-46fa-aa7e-2fca9d674c44', - 'invariantUuid': 'e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0', - 'name': 'ComplexService', - 'version': '1.0', - 'toscaModelURL': null, - 'category': 'Emanuel', - 'serviceType': '', - 'serviceRole': '', - 'description': 'ComplexService', - 'serviceEcompNaming': 'true', - 'instantiationType': 'Macro', - 'inputs': {} - }, - 'vnfs': { - 'VF_vGeraldine 0': { - 'uuid': 'd6557200-ecf2-4641-8094-5393ae3aae60', - 'invariantUuid': '4160458e-f648-4b30-a176-43881ffffe9e', - 'description': 'VSP_vGeraldine', - 'name': 'VF_vGeraldine', - 'version': '2.0', - 'customizationUuid': '91415b44-753d-494c-926a-456a9172bbb9', - 'inputs': {}, - 'commands': {}, - 'properties': { - 'max_instances': '3', - 'min_instances': '1', - 'gpb2_Internal2_mac': '00:11:22:EF:AC:DF', - 'sctp-b-ipv6-egress_src_start_port': '0', - 'sctp-a-ipv6-egress_rule_application': 'any', - 'Internal2_allow_transit': 'true', - 'sctp-b-IPv6_ethertype': 'IPv6', - 'sctp-a-egress_rule_application': 'any', - 'sctp-b-ingress_action': 'pass', - 'sctp-b-ingress_rule_protocol': 'icmp', - 'ncb2_Internal1_mac': '00:11:22:EF:AC:DF', - 'sctp-b-ipv6-ingress-src_start_port': '0.0', - 'ncb1_Internal2_mac': '00:11:22:EF:AC:DF', - 'fsb_volume_size_0': '320.0', - 'sctp-b-egress_src_addresses': 'local', - 'sctp-a-ipv6-ingress_ethertype': 'IPv4', - 'sctp-a-ipv6-ingress-dst_start_port': '0', - 'sctp-b-ipv6-ingress_rule_application': 'any', - 'domain_name': 'default-domain', - 'sctp-a-ingress_rule_protocol': 'icmp', - 'sctp-b-egress-src_start_port': '0.0', - 'sctp-a-egress_src_addresses': 'local', - 'sctp-b-display_name': 'epc-sctp-b-ipv4v6-sec-group', - 'sctp-a-egress-src_start_port': '0.0', - 'sctp-a-ingress_ethertype': 'IPv4', - 'sctp-b-ipv6-ingress-dst_end_port': '65535', - 'sctp-b-dst_subnet_prefix_v6': '::', - 'nf_naming': '{ecomp_generated_naming=true}', - 'sctp-a-ipv6-ingress_src_subnet_prefix': '0.0.0.0', - 'sctp-b-egress-dst_start_port': '0.0', - 'ncb_flavor_name': 'nv.c20r64d1', - 'gpb1_Internal1_mac': '00:11:22:EF:AC:DF', - 'sctp-b-egress_dst_subnet_prefix_len': '0.0', - 'Internal2_net_cidr': '10.0.0.10', - 'sctp-a-ingress-dst_start_port': '0.0', - 'sctp-a-egress-dst_start_port': '0.0', - 'fsb1_Internal2_mac': '00:11:22:EF:AC:DF', - 'sctp-a-egress_ethertype': 'IPv4', - 'vlc_st_service_mode': 'in-network-nat', - 'sctp-a-ipv6-egress_ethertype': 'IPv4', - 'sctp-a-egress-src_end_port': '65535.0', - 'sctp-b-ipv6-egress_rule_application': 'any', - 'sctp-b-egress_action': 'pass', - 'sctp-a-ingress-src_subnet_prefix_len': '0.0', - 'sctp-b-ipv6-ingress-src_end_port': '65535.0', - 'sctp-b-name': 'epc-sctp-b-ipv4v6-sec-group', - 'fsb2_Internal1_mac': '00:11:22:EF:AC:DF', - 'sctp-a-ipv6-ingress-src_start_port': '0.0', - 'sctp-b-ipv6-egress_ethertype': 'IPv4', - 'Internal1_net_cidr': '10.0.0.10', - 'sctp-a-egress_dst_subnet_prefix': '0.0.0.0', - 'fsb_flavor_name': 'nv.c20r64d1', - 'sctp_rule_protocol': '132', - 'sctp-b-ipv6-ingress_src_subnet_prefix_len': '0', - 'sctp-a-ipv6-ingress_rule_application': 'any', - 'sctp-a-IPv6_ethertype': 'IPv6', - 'vlc2_Internal1_mac': '00:11:22:EF:AC:DF', - 'vlc_st_virtualization_type': 'virtual-machine', - 'sctp-b-ingress-dst_start_port': '0.0', - 'sctp-b-ingress-dst_end_port': '65535.0', - 'sctp-a-ipv6-ingress-src_end_port': '65535.0', - 'sctp-a-display_name': 'epc-sctp-a-ipv4v6-sec-group', - 'sctp-b-ingress_rule_application': 'any', - 'int2_sec_group_name': 'int2-sec-group', - 'vlc_flavor_name': 'nd.c16r64d1', - 'sctp-b-ipv6-egress_src_addresses': 'local', - 'vlc_st_interface_type_int1': 'other1', - 'sctp-b-egress-src_end_port': '65535.0', - 'sctp-a-ipv6-egress-dst_start_port': '0', - 'vlc_st_interface_type_int2': 'other2', - 'sctp-a-ipv6-egress_rule_protocol': 'any', - 'Internal2_shared': 'false', - 'sctp-a-ipv6-egress_dst_subnet_prefix_len': '0', - 'Internal2_rpf': 'disable', - 'vlc1_Internal1_mac': '00:11:22:EF:AC:DF', - 'sctp-b-ipv6-egress_src_end_port': '65535', - 'sctp-a-ipv6-egress_src_addresses': 'local', - 'sctp-a-ingress-dst_end_port': '65535.0', - 'sctp-a-ipv6-egress_src_end_port': '65535', - 'Internal1_forwarding_mode': 'l2', - 'Internal2_dhcp': 'false', - 'sctp-a-dst_subnet_prefix_v6': '::', - 'pxe_image_name': 'MME_PXE-Boot_16ACP04_GA.qcow2', - 'vlc_st_interface_type_gtp': 'other0', - 'ncb1_Internal1_mac': '00:11:22:EF:AC:DF', - 'sctp-b-src_subnet_prefix_v6': '::', - 'sctp-a-egress_dst_subnet_prefix_len': '0.0', - 'int1_sec_group_name': 'int1-sec-group', - 'Internal1_dhcp': 'false', - 'sctp-a-ipv6-egress_dst_end_port': '65535', - 'Internal2_forwarding_mode': 'l2', - 'fsb2_Internal2_mac': '00:11:22:EF:AC:DF', - 'sctp-b-egress_dst_subnet_prefix': '0.0.0.0', - 'Internal1_net_cidr_len': '17', - 'gpb2_Internal1_mac': '00:11:22:EF:AC:DF', - 'sctp-b-ingress-src_subnet_prefix_len': '0.0', - 'sctp-a-ingress_dst_addresses': 'local', - 'sctp-a-egress_action': 'pass', - 'fsb_volume_type_0': 'SF-Default-SSD', - 'ncb2_Internal2_mac': '00:11:22:EF:AC:DF', - 'vlc_st_interface_type_sctp_a': 'left', - 'vlc_st_interface_type_sctp_b': 'right', - 'sctp-a-src_subnet_prefix_v6': '::', - 'vlc_st_version': '2', - 'sctp-b-egress_ethertype': 'IPv4', - 'sctp-a-ingress_rule_application': 'any', - 'gpb1_Internal2_mac': '00:11:22:EF:AC:DF', - 'instance_ip_family_v6': 'v6', - 'sctp-a-ipv6-egress_src_start_port': '0', - 'sctp-b-ingress-src_start_port': '0.0', - 'sctp-b-ingress_dst_addresses': 'local', - 'fsb1_Internal1_mac': '00:11:22:EF:AC:DF', - 'vlc_st_interface_type_oam': 'management', - 'multi_stage_design': 'false', - 'oam_sec_group_name': 'oam-sec-group', - 'Internal2_net_gateway': '10.0.0.10', - 'sctp-a-ipv6-ingress-dst_end_port': '65535', - 'sctp-b-ipv6-egress-dst_start_port': '0', - 'Internal1_net_gateway': '10.0.0.10', - 'sctp-b-ipv6-egress_rule_protocol': 'any', - 'gtp_sec_group_name': 'gtp-sec-group', - 'sctp-a-ipv6-egress_dst_subnet_prefix': '0.0.0.0', - 'sctp-b-ipv6-egress_dst_subnet_prefix_len': '0', - 'sctp-a-ipv6-ingress_dst_addresses': 'local', - 'sctp-a-egress_rule_protocol': 'icmp', - 'sctp-b-ipv6-egress_action': 'pass', - 'sctp-a-ipv6-egress_action': 'pass', - 'Internal1_shared': 'false', - 'sctp-b-ipv6-ingress_rule_protocol': 'any', - 'Internal2_net_cidr_len': '17', - 'sctp-a-name': 'epc-sctp-a-ipv4v6-sec-group', - 'sctp-a-ingress-src_end_port': '65535.0', - 'sctp-b-ipv6-ingress_src_subnet_prefix': '0.0.0.0', - 'sctp-a-egress-dst_end_port': '65535.0', - 'sctp-a-ingress_action': 'pass', - 'sctp-b-egress_rule_protocol': 'icmp', - 'sctp-b-ipv6-ingress_action': 'pass', - 'vlc_st_service_type': 'firewall', - 'sctp-b-ipv6-egress_dst_end_port': '65535', - 'sctp-b-ipv6-ingress-dst_start_port': '0', - 'vlc2_Internal2_mac': '00:11:22:EF:AC:DF', - 'vlc_st_availability_zone': 'true', - 'fsb_volume_image_name_1': 'MME_FSB2_16ACP04_GA.qcow2', - 'sctp-b-ingress-src_subnet_prefix': '0.0.0.0', - 'sctp-a-ipv6-ingress_src_subnet_prefix_len': '0', - 'Internal1_allow_transit': 'true', - 'gpb_flavor_name': 'nv.c20r64d1', - 'availability_zone_max_count': '1', - 'fsb_volume_image_name_0': 'MME_FSB1_16ACP04_GA.qcow2', - 'sctp-b-ipv6-ingress_dst_addresses': 'local', - 'sctp-b-ipv6-egress_dst_subnet_prefix': '0.0.0.0', - 'sctp-b-ipv6-ingress_ethertype': 'IPv4', - 'vlc1_Internal2_mac': '00:11:22:EF:AC:DF', - 'sctp-a-ingress-src_subnet_prefix': '0.0.0.0', - 'sctp-a-ipv6-ingress_action': 'pass', - 'Internal1_rpf': 'disable', - 'sctp-b-ingress_ethertype': 'IPv4', - 'sctp-b-egress_rule_application': 'any', - 'sctp-b-ingress-src_end_port': '65535.0', - 'sctp-a-ipv6-ingress_rule_protocol': 'any', - 'sctp-a-ingress-src_start_port': '0.0', - 'sctp-b-egress-dst_end_port': '65535.0' - }, - 'type': 'VF', - 'modelCustomizationName': 'VF_vGeraldine 0', - 'vfModules': { - 'vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1': { - 'uuid': '522159d5-d6e0-4c2a-aa44-5a542a12a830', - 'invariantUuid': '98a7c88b-b577-476a-90e4-e25a5871e02b', - 'customizationUuid': '55b1be94-671a-403e-a26c-667e9c47d091', - 'description': null, - 'name': 'VfVgeraldine..vflorence_vlc..module-1', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..vflorence_vlc..module-1', - 'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0}, - 'commands': {}, - 'volumeGroupAllowed': false - }, - 'vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2': { - 'uuid': '41708296-e443-4c71-953f-d9a010f059e1', - 'invariantUuid': '1cca90b8-3490-495e-87da-3f3e4c57d5b9', - 'customizationUuid': '6add59e0-7fe1-4bc4-af48-f8812422ae7c', - 'description': null, - 'name': 'VfVgeraldine..vflorence_gpb..module-2', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..vflorence_gpb..module-2', - 'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0}, - 'commands': {}, - 'volumeGroupAllowed': false - }, - 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': { - 'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87', - 'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d', - 'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861', - 'description': null, - 'name': 'VfVgeraldine..base_vflorence..module-0', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0', - 'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1}, - 'commands': {}, - 'volumeGroupAllowed': true - } - }, - 'volumeGroups': { - 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': { - 'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87', - 'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d', - 'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861', - 'description': null, - 'name': 'VfVgeraldine..base_vflorence..module-0', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0', - 'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1} - } - } - } - }, - 'networks': { - 'ExtVL 0': { - 'uuid': 'ddc3f20c-08b5-40fd-af72-c6d14636b986', - 'invariantUuid': '379f816b-a7aa-422f-be30-17114ff50b7c', - 'description': 'ECOMP generic virtual link (network) base type for all other service-level and global networks', - 'name': 'ExtVL', - 'version': '37.0', - 'customizationUuid': '94fdd893-4a36-4d70-b16a-ec29c54c184f', - 'inputs': {}, - 'commands': {}, - 'properties': { - 'network_assignments': '{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}', - 'exVL_naming': '{ecomp_generated_naming=true}', - 'network_flows': '{is_network_policy=false, is_bound_to_vpn=false}', - 'network_homing': '{ecomp_selected_instance_node_target=false}' - }, - 'type': 'VL', - 'modelCustomizationName': 'ExtVL 0' - } - }, - 'configurations': { - 'Port Mirroring Configuration By Policy 0': { - 'uuid': 'b4398538-e89d-4f13-b33d-ca323434ba50', - 'invariantUuid': '6ef0ca40-f366-4897-951f-abd65d25f6f7', - 'description': 'A port mirroring configuration by policy object', - 'name': 'Port Mirroring Configuration By Policy', - 'version': '27.0', - 'customizationUuid': '3c3b7b8d-8669-4b3b-8664-61970041fad2', - 'inputs': {}, - 'commands': {}, - 'properties': {}, - 'type': 'Configuration', - 'modelCustomizationName': 'Port Mirroring Configuration By Policy 0', - 'sourceNodes': [], - 'collectorNodes': null, - 'configurationByPolicy': false - } - }, - 'serviceProxies': {}, - 'vfModules': { - 'vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1': { - 'uuid': '522159d5-d6e0-4c2a-aa44-5a542a12a830', - 'invariantUuid': '98a7c88b-b577-476a-90e4-e25a5871e02b', - 'customizationUuid': '55b1be94-671a-403e-a26c-667e9c47d091', - 'description': null, - 'name': 'VfVgeraldine..vflorence_vlc..module-1', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..vflorence_vlc..module-1', - 'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0}, - 'commands': {}, - 'volumeGroupAllowed': false - }, - 'vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2': { - 'uuid': '41708296-e443-4c71-953f-d9a010f059e1', - 'invariantUuid': '1cca90b8-3490-495e-87da-3f3e4c57d5b9', - 'customizationUuid': '6add59e0-7fe1-4bc4-af48-f8812422ae7c', - 'description': null, - 'name': 'VfVgeraldine..vflorence_gpb..module-2', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..vflorence_gpb..module-2', - 'properties': {'minCountInstances': 0, 'maxCountInstances': null, 'initialCount': 0}, - 'commands': {}, - 'volumeGroupAllowed': false - }, - 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': { - 'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87', - 'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d', - 'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861', - 'description': null, - 'name': 'VfVgeraldine..base_vflorence..module-0', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0', - 'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1}, - 'commands': {}, - 'volumeGroupAllowed': true - } - }, - 'volumeGroups': { - 'vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0': { - 'uuid': 'a27f5cfc-7f12-4f99-af08-0af9c3885c87', - 'invariantUuid': 'a6f9e51a-2b35-416a-ae15-15e58d61f36d', - 'customizationUuid': 'f8c040f1-7e51-4a11-aca8-acf256cfd861', - 'description': null, - 'name': 'VfVgeraldine..base_vflorence..module-0', - 'version': '2', - 'modelCustomizationName': 'VfVgeraldine..base_vflorence..module-0', - 'properties': {'minCountInstances': 1, 'maxCountInstances': 1, 'initialCount': 1} - } - }, - 'pnfs': {} - } - } - )); - } }); diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts index c9a89cf6f..56d708bb9 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/available-models-tree/available-models-tree.service.ts @@ -77,7 +77,13 @@ export class AvailableModelsTreeService { shouldOpenVRFModal(nodes, serviceModelId: string , service) { for(const node of nodes){ if(node.type === 'VRF' && service.serviceInstance[serviceModelId].existingVRFCounterMap && !service.serviceInstance[serviceModelId].existingVRFCounterMap[node.modelUniqueId]){ - const vrfModel : VrfModel = node.getModel(node.name, node, service.serviceInstance[serviceModelId]); + const serviceHierarchy = service.serviceHierarchy[serviceModelId]; + + const instanceModel = this._sharedTreeService.modelByIdentifiers( + serviceHierarchy, node.modelTypeName, node.modelCustomizationId, node.name + ); + + const vrfModel : VrfModel = node.getModel(instanceModel); const vrfCounter : number = service.serviceInstance[serviceModelId].existingVRFCounterMap[node.modelUniqueId]; console.log('vrfCounter', vrfCounter); if(vrfModel.min > 0 && (_.isNil(vrfCounter) || vrfCounter === 0)){ |