From b35670742c728d7d85da2f9c856c51a5889449d6 Mon Sep 17 00:00:00 2001 From: Ofir Sonsino Date: Mon, 4 Sep 2017 14:52:07 +0300 Subject: [VID-55] Upgrade Tosca Parser (merge) Change-Id: I5389f1641ef22df3ed569a154b3c367117c04d04 Signed-off-by: Ofir Sonsino --- .../scripts/controller/aaiSubscriberController.js | 2 +- .../app/vid/scripts/controller/subscriberSearch.js | 137 +++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/controller') diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js index 496c06f1..eac79ed5 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/aaiSubscriberController.js @@ -41,7 +41,7 @@ appDS2.controller("aaiSubscriberController", [ "COMPONENT", "FIELD", "PARAMETER" $scope.defaultBaseUrl = ""; $scope.responseTimeoutMsec = 60000; - $scope.serviceTypes=[ FIELD.PROMPT.SELECT_SERVICE]; + $scope.serviceTypes=[ FIELD.PROMPT.SELECT_SERVICE, COMPONENT.UCPE_VMS, COMPONENT.SDN_L3_BONDING, COMPONENT.SDN_ETHERNET_INTERNET]; $scope.defaultSubscriberName=[ FIELD.PROMPT.SELECT_SUB ]; var callbackFunction = function(response) { diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js index 2cf689e7..06cbf058 100755 --- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js +++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/subscriberSearch.js @@ -238,7 +238,144 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log }); } + /* + * Test data objects: + */ + var subscriberInfo = { + globalSubscriberId : COMPONENT.GLOBAL_SUBSCRIBER_ID_1, + subscriberName : COMPONENT.SUBSCRIBER_NAME_GED12 + }; + + var createServiceRequestDetails = { + modelInfo : { + modelType : COMPONENT.SERVICE, + modelId : COMPONENT.MODEL_ID_1, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_1, + modelName : COMPONENT.MODEL_NAME_WANBONDING, + modelVersion : COMPONENT.MODEL_VERSION_1 + }, + subscriberInfo : subscriberInfo, + requestParameters : { + vpnId : COMPONENT.VPN_ID_1, + productName : COMPONENT.PRODUCT_NAME_TRINITY, + customerId : COMPONENT.CUSTOMER_ID_1 + } + }; + + var deleteServiceRequestDetails = { + modelInfo : { + modelType : COMPONENT.SERVICE, + modelId : COMPONENT.MODEL_ID_1, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_1, + modelName : COMPONENT.MODEL_NAME_WANBONDING, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + }; + + var createNetworkRequestDetails = { + modelInfo : { + modelType : COMPONENT.NETWORK, + modelId : COMPONENT.MODEL_ID_2, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_2, + modelName : COMPONENT.MODEL_NAME_VISBCOAMNETWORK, + modelVersion : COMPONENT.MODEL_VERSION_1 + }, + relatedModelList : [ + { + relatedModel : { + instanceId : COMPONENT.INSTANCE_ID_1, + modelInfo : { + modelType : COMPONENT.SERVICE, + modelId : COMPONENT.MODEL_ID_3, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_3, + modelName : COMPONENT.MODEL_NAME_IISBC, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + } + }, + { + relatedModel : { + instanceId : COMPONENT.INSTANCE_ID_2, + modelInfo : { + modelType : COMPONENT.VNF, + modelId : COMPONENT.MODEL_ID_4, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_4, + modelName : COMPONENT.MODEL_NAME_VISBC, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + } + }, + { + relatedModel : { + instanceId : COMPONENT.INSTANCE_ID_3, + modelInfo : { + modelType : COMPONENT.VF_MODULE, + modelId : COMPONENT.MODEL_ID_5, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_5, + modelName : COMPONENT.MODEL_NAME_VISBCRTPEXPANSIONMODULE, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + } + } ], + subscriberInfo : subscriberInfo, + requestParameters : { + /* + * FYI: quotes around field names are needed due to embedded "-" + * characters + */ + "cidr-mask" : COMPONENT.CIDR_MASK_1, + "gateway-address" : COMPONENT.GATEWAY_ADDRESS_1, + "dhcp-enabled" : COMPONENT.TRUE + } + }; + + var deleteNetworkRequestDetails = { + modelInfo : { + modelType : COMPONENT.NETWORK, + modelId : COMPONENT.MODEL_ID_2, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_2, + modelName : COMPONENT.MODEL_NAME_VISBCOAMNETWORK, + modelVersion : COMPONENT.MODEL_VERSION_1 + }, + relatedModelList : [ + { + relatedModel : { + instanceId : COMPONENT.INSTANCE_ID_1, + modelInfo : { + modelType : COMPONENT.SERVICE, + modelId : COMPONENT.MODEL_ID_3, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_3, + modelName : COMPONENT.MODEL_NAME_IISBC, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + } + }, + { + relatedModel : { + instanceId : COMPONENT.INSTANCE_ID_2, + modelInfo : { + modelType : COMPONENT.VNF, + modelId : COMPONENT.MODEL_ID_4, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_4, + modelName : COMPONENT.MODEL_NAME_VISBC, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + } + }, + { + relatedModel : { + instanceId : COMPONENT.INSTANCE_ID_3, + modelInfo : { + modelType : COMPONENT.VF_MODULE, + modelId : COMPONENT.MODEL_ID_5, + modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_5, + modelName : COMPONENT.MODEL_NAME_VISBCRTPEXPANSIONMODULE, + modelVersion : COMPONENT.MODEL_VERSION_1 + } + } + } ] + }; $scope.getSubscriberDet = function(selectedCustomer){ window.location.href = COMPONENT.SUBDETAILS_SELECTEDSUBSCRIBER + selectedCustomer; }; -- cgit 1.2.3-korg