From 9dfd7e28c1eb348fcb4a2de8c6faae2a01b34942 Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Wed, 20 Sep 2017 13:20:42 +0300 Subject: Global Read only role, Support VID specific Roles Issue-ID: VID-46 , VID-47 Change-Id: Ib100d20ac40a65d39e27a6e2741b19a173a2b8ea Signed-off-by: Ofir Sonsino --- .../webapp/app/vid/scripts/services/vnfService.js | 39 +++++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js index 836279b9..3fc04ba0 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/vnfService.js @@ -41,21 +41,42 @@ var VnfService = function($http, $log, VIDCONFIGURATION, FIELD, UtilityService) if ( ( UtilityService.hasContents ( vnfInstance.object[FIELD.ID.ORCHESTRATION_STATUS] ) ) && ( UtilityService.hasContents ( vnfInstance.object[FIELD.ID.IN_MAINT] ) ) && ( UtilityService.hasContents ( vnfInstance.object[FIELD.ID.PROV_STATUS] ) ) ) { - + status.provStatus = vnfInstance.object[FIELD.ID.PROV_STATUS].toLowerCase(); + console.log ("PROVSTATUS: " + vnfInstance.object[FIELD.ID.PROV_STATUS].toLowerCase()); + status.orchestrationStatus = vnfInstance.object[FIELD.ID.ORCHESTRATION_STATUS].toLowerCase(); + console.log ("ORCHESTRATION STATUS: " + vnfInstance.object[FIELD.ID.ORCHESTRATION_STATUS].toLowerCase()); + status.inMaint = vnfInstance.object[FIELD.ID.IN_MAINT]; - + console.log ("IN MAINT: " + vnfInstance.object[FIELD.ID.IN_MAINT]); + if ( UtilityService.hasContents(vnfInstance.object[FIELD.ID.OPERATIONAL_STATUS]) ) { status.operationalStatus = vnfInstance.object[FIELD.ID.OPERATIONAL_STATUS].toLowerCase(); } - - if ( UtilityService.arrayContains ( VIDCONFIGURATION.VNF_VALID_STATUS_LIST, status ) ) { - return (""); - } - else { - return (errorInvalidCombinationMsg); - } + var i = VIDCONFIGURATION.VNF_VALID_STATUS_LIST.length; + if ( i > 0 ) { + while (i--) { + var item = VIDCONFIGURATION.VNF_VALID_STATUS_LIST[i]; + if ( (item.provStatus === status.provStatus) && (item.inMaint === status.inMaint ) + && (item.orchestrationStatus === status.orchestrationStatus) ) { + if (UtilityService.hasContents(vnfInstance.object[FIELD.ID.OPERATIONAL_STATUS])) { + if (status.operationalStatus === "") { status.operationalStatus = null } + if ( item.operationalStatus === status.operationalStatus ) { + return (""); + } + } + else { + // no contents + if ( item.operationalStatus === null ) { + return (""); + } + } + } + } + } + + return (errorInvalidCombinationMsg); } else { return (errorAaiStatusMsg); -- cgit 1.2.3-korg