diff options
Diffstat (limited to 'vid-app-common/src/main/webapp')
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/test/testMso.js | 36 | ||||
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js | 40 |
2 files changed, 38 insertions, 38 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testMso.js b/vid-app-common/src/main/webapp/app/vid/test/testMso.js index 7f14ef8ce..8e207d52e 100755 --- a/vid-app-common/src/main/webapp/app/vid/test/testMso.js +++ b/vid-app-common/src/main/webapp/app/vid/test/testMso.js @@ -45,13 +45,13 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", setTestMode();
DataService.setSubscriberName("Mobility");
- DataService.setGlobalCustomerId("CUSTID12345")
+ DataService.setGlobalCustomerId("CUSTID12345");
DataService.setServiceType("Mobility Type 1");
DataService.setServiceName("Mobility Service 1");
DataService.setServiceInstanceId("mmsc-test-service-instance");
DataService.setVnfInstanceId("abcd-12345-56789");
DataService.setVfModuleInstanceId("xye-99990123213");
- }
+ };
var TEST_MODE_COOKIE = "isTestModeEnabled";
@@ -75,7 +75,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", } else {
PropertyService.setMsoBaseUrl(defaultMsoBaseUrl);
}
- }
+ };
$scope.autoStartCommitTest = function() {
/*
@@ -87,7 +87,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", // $scope.deleteServiceInstance();
// $scope.generateInvalidUrl404();
}, 500);
- }
+ };
$scope.autoStartQueryTest = function() {
/*
@@ -97,7 +97,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", $timeout(function() {
// $scope.queryServiceInstance();
}, 500);
- }
+ };
$scope.queryServiceInstance = function() {
/*
@@ -106,7 +106,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", $scope.$broadcast("showComponentDetails", {
componentId : COMPONENT.SERVICE
});
- }
+ };
$scope.createServiceInstance = function() {
/*
@@ -116,7 +116,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_create_svc_instance",
requestDetails : createServiceRequestDetails
});
- }
+ };
$scope.deleteServiceInstance = function() {
/*
@@ -126,7 +126,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_delete_svc_instance/bc305d54-75b4-431b-adb2-eb6b9e546014",
requestDetails : deleteServiceRequestDetails
});
- }
+ };
$scope.createVNFInstance = function() {
/*
@@ -136,7 +136,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_create_vnf_instance/bc305d54-75b4-431b-adb2-eb6b9e546099",
requestDetails : createVnfRequestDetails
});
- }
+ };
$scope.deleteVNFInstance = function() {
/*
@@ -146,7 +146,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_delete_vnf_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/ab9000-0009-9999",
requestDetails : deleteVnfRequestDetails
});
- }
+ };
$scope.createVolumeGroupInstance = function() {
/*
@@ -156,7 +156,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_create_volumegroup_instance/bc305d54-75b4-431b-adb2-eb6b9e546099/vnfs/fe305d54-75b4-431b-adb2-eb6b9e546fea",
requestDetails : createVolumeGroupRequestDetails
});
- }
+ };
$scope.deleteVolumeGroupInstance = function() {
/*
@@ -166,7 +166,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_delete_volumegroup_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/vnfs/fe305d54-75b4-431b-adb2-eb6b9e546fea/volumeGroups/fe9000-0009-9999",
requestDetails : deleteVolumeGroupRequestDetails
});
- }
+ };
$scope.createVFModuleInstance = function() {
/*
* Example of method call needed to commit an instance creation request.
@@ -175,7 +175,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_create_vfmodule_instance/bc305d54-75b4-431b-adb2-eb6b9e546099/vnfs/111-111-111-111",
requestDetails : createVFModuleRequestDetails
});
- }
+ };
$scope.deleteVFModuleInstance = function() {
/*
@@ -192,14 +192,14 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_create_nw_instance/789098877777",
requestDetails : createNetworkRequestDetails
});
- }
+ };
$scope.deleteNetworkInstance = function() {
$scope.$broadcast("deleteInstance", {
url : "mso_delete_nw_instance/bc305d54-75b4-431b-adb2-eb6b9e546014/networks/ff305d54-75b4-ff1b-fff1-eb6b9e5460ff",
requestDetails : deleteNetworkRequestDetails
});
- }
+ };
$scope.generateError = function(testName) {
// Clone example request object
@@ -209,7 +209,7 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", url : "mso_create_svc_instance",
requestDetails : request
});
- }
+ };
$scope.generateInvalidUrl404 = function() {
var baseUrl = PropertyService.getMsoBaseUrl();
@@ -223,14 +223,14 @@ app.controller("testController", [ "$scope", "$timeout", "$cookieStore", "$log", $scope.popup.isVisible = false;
}
});
- }
+ };
$scope.generateInvalidUrl405 = function() {
$scope.$broadcast("createInstance", {
url : "INVALID_STRING_mso_create_svc_instance",
requestDetails : createServiceRequestDetails
});
- }
+ };
/*
* Test data objects:
diff --git a/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js b/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js index 5b4d8bd8b..a09a8ce37 100755 --- a/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js +++ b/vid-app-common/src/main/webapp/app/vid/test/testViewEdit.js @@ -47,7 +47,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, */
DataService.setSubscriberName("Mobility");
- DataService.setGlobalCustomerId("CUSTID12345")
+ DataService.setGlobalCustomerId("CUSTID12345");
DataService.setServiceType("Mobility Type 1");
DataService.setServiceInstanceName("Example Service Instance Name");
DataService.setServiceName("Mobility Service 1");
@@ -61,7 +61,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, setTestMode();
- }
+ };
$scope.autoStartTest = function() {
/*
@@ -80,7 +80,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, // $scope.deleteVnf();
// $scope.createVfModule();
}, 500);
- }
+ };
/*
* This block of code is only used for testing.
@@ -165,14 +165,14 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.SERVICE,
callbackFunction : callbackFunction
});
- }
+ };
$scope.createVnf = function() {
DataService.setModelId("91238134091820938018230918230989");
DataService.setModelInstanceName("VNF_MODEL_INSTANCE_NAME");
- DataService.setCloudRegionTenantList(exampleCloudRegionTenantList)
+ DataService.setCloudRegionTenantList(exampleCloudRegionTenantList);
DataService.setServiceIdList(exampleServiceIdList);
// Data used to create MSO "relatedInstanceList" object
@@ -183,7 +183,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VNF,
callbackFunction : callbackFunction
});
- }
+ };
$scope.createVfModule = function() {
DataService
@@ -211,7 +211,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VF_MODULE,
callbackFunction : callbackFunction
});
- }
+ };
$scope.createVolumeGroup = function() {
@@ -230,7 +230,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VOLUME_GROUP,
callbackFunction : callbackFunction
});
- }
+ };
$scope.createNetwork = function() {
@@ -248,7 +248,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.NETWORK,
callbackFunction : callbackFunction
});
- }
+ };
/*
* Delete functions
@@ -263,7 +263,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.SERVICE,
callbackFunction : callbackFunction
});
- }
+ };
$scope.deleteVnf = function() {
@@ -279,7 +279,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VNF,
callbackFunction : callbackFunction
});
- }
+ };
$scope.deleteVfModule = function() {
@@ -296,7 +296,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VF_MODULE,
callbackFunction : callbackFunction
});
- }
+ };
$scope.deleteVolumeGroup = function() {
@@ -313,7 +313,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VOLUME_GROUP,
callbackFunction : callbackFunction
});
- }
+ };
$scope.deleteNetwork = function() {
@@ -328,7 +328,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.NETWORK,
callbackFunction : callbackFunction
});
- }
+ };
/*
* Show Details functions
@@ -341,7 +341,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.SERVICE,
callbackFunction : callbackFunction
});
- }
+ };
$scope.showVnfDetails = function() {
@@ -353,7 +353,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VNF,
callbackFunction : callbackFunction
});
- }
+ };
$scope.showVfModuleDetails = function() {
@@ -365,7 +365,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VF_MODULE,
callbackFunction : callbackFunction
});
- }
+ };
$scope.showVolumeGroupDetails = function() {
@@ -376,7 +376,7 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.VOLUME_GROUP,
callbackFunction : callbackFunction
});
- }
+ };
$scope.showNetworkDetails = function() {
@@ -387,8 +387,8 @@ var testViewEditController = function(COMPONENT, DataService, PropertyService, componentId : COMPONENT.NETWORK,
callbackFunction : callbackFunction
});
- }
-}
+ };
+};
app.controller("testViewEditController", [ "COMPONENT", "DataService",
"PropertyService", "UtilityService", "$scope", "$timeout",
|