aboutsummaryrefslogtreecommitdiffstats
path: root/vid-app-common/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'vid-app-common/src/main')
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java21
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/controller/ControllersUtils.java5
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java84
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerRestInterface.java3
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/test/testMso.js36
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/test/testViewEdit.js40
7 files changed, 126 insertions, 67 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java
index f511a4746..6fe295c15 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/RelationshipList.java
@@ -3,6 +3,7 @@
* VID
* ================================================================================
* Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2018 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -27,6 +28,8 @@ import java.util.List;
@JsonIgnoreProperties(ignoreUnknown = true)
public class RelationshipList {
+ public List<Relationship> relationship;
+
@JsonProperty("relationship")
public List<Relationship> getRelationship() {
return relationship;
@@ -37,7 +40,6 @@ public class RelationshipList {
this.relationship = relationship;
}
- public List<Relationship> relationship;
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
index eee2acc51..2b3ad60ea 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/AaiController.java
@@ -77,6 +77,7 @@ public class AaiController extends RestrictedBaseController {
private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(AaiController.class);
private static final String FROM_APP_ID = "VidAaiController";
+ private final ObjectMapper objectMapper = new ObjectMapper();
private AaiService aaiService;
private AAIRestInterface aaiRestInterface;
@@ -157,7 +158,7 @@ public class AaiController extends RestrictedBaseController {
throws IOException {
ResponseEntity<String> responseEntity;
if (aaiResponseData.getHttpCode() == 200) {
- responseEntity = new ResponseEntity<>(new ObjectMapper().writeValueAsString(aaiResponseData.getT()),
+ responseEntity = new ResponseEntity<>(objectMapper.writeValueAsString(aaiResponseData.getT()),
HttpStatus.OK);
} else {
responseEntity = new ResponseEntity<>(aaiResponseData.getErrorMessage(),
@@ -225,7 +226,6 @@ public class AaiController extends RestrictedBaseController {
@RequestMapping(value = "/aai_get_full_subscribers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
public ResponseEntity<String> getFullSubscriberList(HttpServletRequest request) throws IOException {
- ObjectMapper objectMapper = new ObjectMapper();
ResponseEntity<String> responseEntity;
RoleValidator roleValidator = RoleValidator.by(roleProvider.getUserRoles(request));
SubscriberFilteredResults subscriberList = aaiService.getFullSubscriberList(roleValidator);
@@ -270,17 +270,14 @@ public class AaiController extends RestrictedBaseController {
@RequestMapping(value = "/aai_sub_details/{subscriberId}", method = RequestMethod.GET)
public ResponseEntity<String> getSubscriberDetails(HttpServletRequest request, @PathVariable("subscriberId") String subscriberId,
@RequestParam(value="omitServiceInstances", required = false, defaultValue = "false") boolean omitServiceInstances) throws IOException {
- ObjectMapper objectMapper = new ObjectMapper();
- ResponseEntity responseEntity;
List<Role> roles = roleProvider.getUserRoles(request);
RoleValidator roleValidator = RoleValidator.by(roles);
- AaiResponse subscriberData = aaiService.getSubscriberData(subscriberId, roleValidator, featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH) && omitServiceInstances);
- String httpMessage = subscriberData.getT() != null ?
- objectMapper.writeValueAsString(subscriberData.getT()) :
- subscriberData.getErrorMessage();
+ AaiResponse subscriberData = aaiService.getSubscriberData(subscriberId, roleValidator,
+ featureManager.isActive(Features.FLAG_1906_AAI_SUB_DETAILS_REDUCE_DEPTH) && omitServiceInstances);
+ String httpMessage = subscriberData.getT() != null ? objectMapper.writeValueAsString(subscriberData.getT()) : subscriberData.getErrorMessage();
- responseEntity = new ResponseEntity<>(httpMessage, HttpStatus.valueOf(subscriberData.getHttpCode()));
- return responseEntity;
+ return new ResponseEntity<>(httpMessage,
+ HttpStatus.valueOf(subscriberData.getHttpCode()));
}
@RequestMapping(value = "/search_service_instances", method = RequestMethod.GET)
@@ -289,7 +286,6 @@ public class AaiController extends RestrictedBaseController {
@RequestParam(value = "serviceInstanceIdentifier", required = false) String instanceIdentifier,
@RequestParam(value = "project", required = false) List<String> projects,
@RequestParam(value = "owningEntity", required = false) List<String> owningEntities) throws IOException {
- ObjectMapper objectMapper = new ObjectMapper();
ResponseEntity responseEntity;
List<Role> roles = roleProvider.getUserRoles(request);
@@ -354,7 +350,6 @@ public class AaiController extends RestrictedBaseController {
@RequestMapping(value = "/aai_get_network_collection_details/{serviceInstanceId}", method = RequestMethod.GET)
public ResponseEntity<String> getNetworkCollectionDetails(
@PathVariable("serviceInstanceId") String serviceInstanceId) throws IOException {
- com.fasterxml.jackson.databind.ObjectMapper objectMapper = new com.fasterxml.jackson.databind.ObjectMapper();
AaiResponse<String> resp = aaiService.getNetworkCollectionDetails(serviceInstanceId);
String httpMessage = resp.getT() != null ?
@@ -367,7 +362,6 @@ public class AaiController extends RestrictedBaseController {
public ResponseEntity<String> getInstanceGroupsByCloudRegion(@PathVariable("cloudOwner") String cloudOwner,
@PathVariable("cloudRegionId") String cloudRegionId,
@PathVariable("networkFunction") String networkFunction) throws IOException {
- com.fasterxml.jackson.databind.ObjectMapper objectMapper = new com.fasterxml.jackson.databind.ObjectMapper();
AaiResponse<AaiGetInstanceGroupsByCloudRegion> resp = aaiService
.getInstanceGroupsByCloudRegion(cloudOwner, cloudRegionId, networkFunction);
@@ -424,7 +418,6 @@ public class AaiController extends RestrictedBaseController {
ResponseEntity responseEntity;
try {
- ObjectMapper objectMapper = new ObjectMapper();
List<Role> roles = roleProvider.getUserRoles(request);
RoleValidator roleValidator = RoleValidator.by(roles);
AaiResponse<GetTenantsResponse[]> response = aaiService
diff --git a/vid-app-common/src/main/java/org/onap/vid/controller/ControllersUtils.java b/vid-app-common/src/main/java/org/onap/vid/controller/ControllersUtils.java
index befbe0320..693c84bff 100644
--- a/vid-app-common/src/main/java/org/onap/vid/controller/ControllersUtils.java
+++ b/vid-app-common/src/main/java/org/onap/vid/controller/ControllersUtils.java
@@ -4,6 +4,7 @@
* ================================================================================
* Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
* Modifications Copyright (C) 2019 Nokia. All rights reserved.
+ * Modifications Copyright (C) 2019 IBM.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -45,9 +46,7 @@ public final class ControllersUtils {
public static ExceptionResponse handleException(Exception e, EELFLoggerDelegate logger) {
logger.error(EELFLoggerDelegate.errorLogger, "{}: {}", getMethodCallerName(), ExceptionUtils.getMessage(e), e);
-
- ExceptionResponse exceptionResponse = new ExceptionResponse(e);
- return exceptionResponse;
+ return new ExceptionResponse(e);
}
public static ResponseEntity handleWebApplicationException(WebApplicationException e, EELFLoggerDelegate logger) {
diff --git a/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java b/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java
index 514779f49..309ead40c 100644
--- a/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java
+++ b/vid-app-common/src/main/java/org/onap/vid/logging/VidLoggerAspect.java
@@ -20,6 +20,13 @@
package org.onap.vid.logging;
+import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;
+import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
@@ -27,13 +34,14 @@ import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.onap.portalsdk.core.logging.aspect.EELFLoggerAdvice;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.service.AppService;
import org.onap.portalsdk.core.util.SystemProperties;
+import org.onap.portalsdk.core.web.support.UserUtils;
+import org.onap.vid.controller.ControllersUtils;
+import org.onap.vid.utils.SystemPropertiesWrapper;
import org.springframework.beans.factory.annotation.Autowired;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
@Aspect
@@ -41,10 +49,14 @@ import static com.att.eelf.configuration.Configuration.MDC_SERVER_FQDN;
public class VidLoggerAspect {
private String canonicalHostName;
- @Autowired
- EELFLoggerAdvice advice;
+ private final ControllersUtils controllersUtils;
+ private final String appName;
+
+ private final EELFLoggerAdvice advice;
- public VidLoggerAspect() {
+ @Autowired
+ public VidLoggerAspect(EELFLoggerAdvice advice, SystemPropertiesWrapper systemPropertiesWrapper,
+ AppService appService) {
try {
final InetAddress localHost = InetAddress.getLocalHost();
canonicalHostName = localHost.getCanonicalHostName();
@@ -52,9 +64,13 @@ public class VidLoggerAspect {
// YOLO
canonicalHostName = null;
}
+ this.advice = advice;
+ this.controllersUtils = new ControllersUtils(systemPropertiesWrapper);
+
+ this.appName = defaultIfEmpty(appService.getDefaultAppName(), SystemProperties.SDK_NAME);
}
- @Pointcut("execution(public * org.onap.vid.controller.*Controller.*(..))")
+ @Pointcut("execution(public * org.onap.vid.controller..*Controller.*(..))")
public void vidControllers() {}
@Around("vidControllers() && (" +
@@ -69,7 +85,10 @@ public class VidLoggerAspect {
private Object logAroundMethod(ProceedingJoinPoint joinPoint, SystemProperties.SecurityEventTypeEnum securityEventType) throws Throwable {
//Before
Object[] passOnArgs = new Object[] {joinPoint.getSignature().getDeclaringType().getName(),joinPoint.getSignature().getName()};
- Object[] returnArgs = advice.before(securityEventType, joinPoint.getArgs(), passOnArgs);
+ Object[] returnArgs = advice.before(securityEventType, fabricateArgsWithNull(), passOnArgs);
+
+ fixSetRequestBasedDefaultsIntoGlobalLoggingContext(httpServletRequestOrNull(joinPoint),
+ joinPoint.getSignature().getDeclaringType().getName());
fixServerFqdnInMDC();
@@ -94,6 +113,51 @@ public class VidLoggerAspect {
EELFLoggerDelegate.mdcPut(SystemProperties.STATUS_CODE, restStatus);
}
+ /**
+ * Returns an array with a single entry with a null value. This will stop org.onap.portalsdk.core.logging.aspect.EELFLoggerAdvice.before
+ * from throwing on ArrayIndexOutOfBound, and also prevent SessionExpiredException.
+ */
+ private Object[] fabricateArgsWithNull() {
+ return new Object[]{null};
+ }
+
+ /**
+ * Finds the first joinPoint's param which is an HttpServletRequest. If not found, use Spring's RequestContextHolder
+ * to retrieve it.
+ *
+ * @return null or the current httpServletRequest
+ */
+ private HttpServletRequest httpServletRequestOrNull(ProceedingJoinPoint joinPoint) {
+ final Object httpServletRequest = Arrays.stream(joinPoint.getArgs())
+ .filter(param -> param instanceof HttpServletRequest)
+ .findFirst()
+ .orElseGet(() -> {
+ try {
+ return ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes()).getRequest();
+ } catch (Exception e) { // ClassCast, IllegalState, etc.
+ return null;
+ }
+ });
+
+ return (HttpServletRequest) httpServletRequest;
+ }
+
+ /**
+ * Mimics a part from org.onap.portalsdk.core.logging.aspect.EELFLoggerAdvice.before, but with much more carefulness
+ * of exceptions and defaults. Main difference is that if no session, function does not throw. It just fallback to
+ * an empty loginId.
+ */
+ private void fixSetRequestBasedDefaultsIntoGlobalLoggingContext(HttpServletRequest httpServletRequest, String className) {
+ if (httpServletRequest != null) {
+
+ EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
+ String requestId = UserUtils.getRequestId(httpServletRequest);
+ String loginId = controllersUtils.extractUserId(httpServletRequest);
+
+ logger.setRequestBasedDefaultsIntoGlobalLoggingContext(httpServletRequest, appName, requestId, loginId);
+ }
+ }
+
// Override the non-canonical hostname set by EELFLoggerDelegate::setGlobalLoggingContext()
// that was invoked by advice.before() (and some other SDK cases)
private void fixServerFqdnInMDC() {
diff --git a/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerRestInterface.java b/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerRestInterface.java
index 7878c2fb8..001a8ae6d 100644
--- a/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerRestInterface.java
+++ b/vid-app-common/src/main/java/org/onap/vid/scheduler/SchedulerRestInterface.java
@@ -98,12 +98,13 @@ public class SchedulerRestInterface implements SchedulerRestInterfaceIfc {
status = response.getStatus();
restObject.setStatusCode(status);
rawData = response.getBody();
+ restObject.setRaw(rawData);
if (status == 200) {
if (t instanceof String) {
restObject.set((T)rawData);
}
else {
- restObject.set(JACKSON_OBJECT_MAPPER.readValue(rawData, new TypeReference<T>() {}));
+ restObject.set(JACKSON_OBJECT_MAPPER.readValue(rawData, (Class<T>)t.getClass()));
}
logger.debug(EELFLoggerDelegate.debugLogger, "<== " + methodName + SUCCESSFUL_API_MESSAGE);
logger.info(EELFLoggerDelegate.errorLogger, "<== " + methodName + SUCCESSFUL_API_MESSAGE);
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",