Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / controller / subscriberSearch.js

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 afd7aba..89768f8 100755 (executable)
--- 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
@@ -64,14 +64,12 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log
                var polls = PropertyService.retrieveMsoMaxPolls();\r
                PropertyService.setMsoMaxPolls(polls);\r
                \r
-               PropertyService.setServerResponseTimeoutMsec(10000);\r
-\r
-                       // These two properties only added for testing  \r
+               // These two properties only added for testing\r
                        properties.msoDefaultBaseUrl = $scope.baseUrl;\r
                        properties.responseTimeoutMsec = $scope.responseTimeoutMsec;\r
 \r
                        UtilityService.setProperties(properties);\r
-               }\r
+               };\r
                \r
                $scope.autoGetSubs = function() {\r
                        /*\r
@@ -238,7 +236,144 @@ appDS2.controller("aaiSubscriberSearchController", [ "$scope", "$timeout", "$log
                        });\r
                }\r
        \r
-\r
+               /*\r
+                * Test data objects:\r
+                */\r
+       \r
+               var subscriberInfo = {\r
+                       globalSubscriberId : COMPONENT.GLOBAL_SUBSCRIBER_ID_1,\r
+                       subscriberName : COMPONENT.SUBSCRIBER_NAME_GED12\r
+               };\r
+       \r
+               var createServiceRequestDetails = {\r
+                       modelInfo : {\r
+                               modelType : COMPONENT.SERVICE,\r
+                               modelId : COMPONENT.MODEL_ID_1,\r
+                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_1,\r
+                               modelName : COMPONENT.MODEL_NAME_WANBONDING,\r
+                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                       },\r
+                       subscriberInfo : subscriberInfo,\r
+                       requestParameters : {\r
+                               vpnId : COMPONENT.VPN_ID_1,\r
+                               productName : COMPONENT.PRODUCT_NAME_TRINITY,\r
+                               customerId : COMPONENT.CUSTOMER_ID_1\r
+                       }\r
+               };\r
+       \r
+               var deleteServiceRequestDetails = {\r
+                       modelInfo : {\r
+                               modelType : COMPONENT.SERVICE,\r
+                               modelId : COMPONENT.MODEL_ID_1,\r
+                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_1,\r
+                               modelName : COMPONENT.MODEL_NAME_WANBONDING,\r
+                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                       }\r
+               };\r
+       \r
+               var createNetworkRequestDetails = {\r
+                       modelInfo : {\r
+                               modelType : COMPONENT.NETWORK,\r
+                               modelId : COMPONENT.MODEL_ID_2,\r
+                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_2,\r
+                               modelName : COMPONENT.MODEL_NAME_VISBCOAMNETWORK,\r
+                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                       },\r
+                       relatedModelList : [\r
+                                       {\r
+                                               relatedModel : {\r
+                                                       instanceId : COMPONENT.INSTANCE_ID_1,\r
+                                                       modelInfo : {\r
+                                                               modelType : COMPONENT.SERVICE,\r
+                                                               modelId : COMPONENT.MODEL_ID_3,\r
+                                                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_3,\r
+                                                               modelName : COMPONENT.MODEL_NAME_IISBC,\r
+                                                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                                                       }\r
+                                               }\r
+                                       },\r
+                                       {\r
+                                               relatedModel : {\r
+                                                       instanceId : COMPONENT.INSTANCE_ID_2,\r
+                                                       modelInfo : {\r
+                                                               modelType : COMPONENT.VNF,\r
+                                                               modelId : COMPONENT.MODEL_ID_4,\r
+                                                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_4,\r
+                                                               modelName : COMPONENT.MODEL_NAME_VISBC,\r
+                                                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                                                       }\r
+                                               }\r
+                                       },\r
+                                       {\r
+                                               relatedModel : {\r
+                                                       instanceId : COMPONENT.INSTANCE_ID_3,\r
+                                                       modelInfo : {\r
+                                                               modelType : COMPONENT.VF_MODULE,\r
+                                                               modelId : COMPONENT.MODEL_ID_5,\r
+                                                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_5,\r
+                                                               modelName : COMPONENT.MODEL_NAME_VISBCRTPEXPANSIONMODULE,\r
+                                                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                                                       }\r
+                                               }\r
+                                       } ],\r
+                       subscriberInfo : subscriberInfo,\r
+                       requestParameters : {\r
+                               /*\r
+                                * FYI: quotes around field names are needed due to embedded "-"\r
+                                * characters\r
+                                */\r
+                               "cidr-mask" : COMPONENT.CIDR_MASK_1,\r
+                               "gateway-address" : COMPONENT.GATEWAY_ADDRESS_1,\r
+                               "dhcp-enabled" : COMPONENT.TRUE\r
+                       }\r
+               };\r
+       \r
+               var deleteNetworkRequestDetails = {\r
+                       modelInfo : {\r
+                               modelType : COMPONENT.NETWORK,\r
+                               modelId : COMPONENT.MODEL_ID_2,\r
+                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_2,\r
+                               modelName : COMPONENT.MODEL_NAME_VISBCOAMNETWORK,\r
+                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                       },\r
+                       relatedModelList : [\r
+                                       {\r
+                                               relatedModel : {\r
+                                                       instanceId : COMPONENT.INSTANCE_ID_1,\r
+                                                       modelInfo : {\r
+                                                               modelType : COMPONENT.SERVICE,\r
+                                                               modelId : COMPONENT.MODEL_ID_3,\r
+                                                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_3,\r
+                                                               modelName : COMPONENT.MODEL_NAME_IISBC,\r
+                                                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                                                       }\r
+                                               }\r
+                                       },\r
+                                       {\r
+                                               relatedModel : {\r
+                                                       instanceId : COMPONENT.INSTANCE_ID_2,\r
+                                                       modelInfo : {\r
+                                                               modelType : COMPONENT.VNF,\r
+                                                               modelId : COMPONENT.MODEL_ID_4,\r
+                                                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_4,\r
+                                                               modelName : COMPONENT.MODEL_NAME_VISBC,\r
+                                                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                                                       }\r
+                                               }\r
+                                       },\r
+                                       {\r
+                                               relatedModel : {\r
+                                                       instanceId : COMPONENT.INSTANCE_ID_3,\r
+                                                       modelInfo : {\r
+                                                               modelType : COMPONENT.VF_MODULE,\r
+                                                               modelId : COMPONENT.MODEL_ID_5,\r
+                                                               modelNameVersionId : COMPONENT.MODEL_NAME_VERSION_ID_5,\r
+                                                               modelName : COMPONENT.MODEL_NAME_VISBCRTPEXPANSIONMODULE,\r
+                                                               modelVersion : COMPONENT.MODEL_VERSION_1\r
+                                                       }\r
+                                               }\r
+                                       } ]\r
+               };\r
                $scope.getSubscriberDet = function(selectedCustomer){\r
                        window.location.href = COMPONENT.SUBDETAILS_SELECTEDSUBSCRIBER + selectedCustomer;\r
                };\r