aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xepsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js4
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java8
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java19
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java13
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java7
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java11
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java16
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java1
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java1
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js20
10 files changed, 51 insertions, 49 deletions
diff --git a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js
index 416dc3272..cb74a6689 100755
--- a/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js
+++ b/epsdk-app-onap/src/main/webapp/app/fusion/external/ebz/angular_js/app.js
@@ -7,8 +7,8 @@ app.run(function(featureFlags, $http) {
$http.get('flags').then(function (results) {
var flags = [];
for (var key in results.data) {
- flags.push({"key":key, "active":results.data[key]})
+ flags.push({"key":key, "active":results.data[key]});
}
featureFlags.set(flags);
- })
+ });
});
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
index ec7ea8a53..8ad6cd61a 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/AaiGetNetworkCollectionDetails.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.
@@ -25,12 +26,13 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public class AaiGetNetworkCollectionDetails {
+ @JsonProperty("results")
+ private Result results = null;
+
public AaiGetNetworkCollectionDetails(){
results = new Result();
}
- @JsonProperty("results")
- private Result results = null;
-
+
@JsonProperty("results")
public Result getResults() {
return results;
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java
index b14cfa8e2..37ec17976 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/InstanceGroupInfo.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.
@@ -21,15 +22,8 @@
package org.onap.vid.aai.model;
public class InstanceGroupInfo {
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- private String type;
+
+ private String type;
private String name;
public InstanceGroupInfo(String name){
@@ -37,6 +31,13 @@ public class InstanceGroupInfo {
this.type = "instance-group";
}
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
public String getName() {
return name;
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java b/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java
index af181eb1f..391c295e0 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/util/HttpsAuthClient.java
@@ -51,6 +51,12 @@ public class HttpsAuthClient {
private final SystemPropertyHelper systemPropertyHelper;
private final SSLContextProvider sslContextProvider;
+ private final String certFilePath;
+ FeatureManager featureManager;
+
+ /** The logger. */
+ static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(org.onap.vid.aai.util.HttpsAuthClient.class);
+
public HttpsAuthClient(String certFilePath, SystemPropertyHelper systemPropertyHelper, SSLContextProvider sslContextProvider, FeatureManager featureManager) {
this.certFilePath = certFilePath;
@@ -59,13 +65,6 @@ public class HttpsAuthClient {
this.featureManager = featureManager;
}
- private final String certFilePath;
-
- FeatureManager featureManager;
-
- /** The logger. */
- static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(org.onap.vid.aai.util.HttpsAuthClient.class);
-
/**
* Gets the client.
diff --git a/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java b/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java
index 7a9787c7f..0c3a57df3 100644
--- a/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java
+++ b/vid-app-common/src/main/java/org/onap/vid/changeManagement/GetVnfWorkflowRelationRequest.java
@@ -3,6 +3,7 @@
* VID
* ================================================================================
* Copyright (C) 2017 - 2019 AT&T Intellectual Property. 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.
@@ -25,6 +26,9 @@ import java.util.List;
import com.fasterxml.jackson.annotation.JsonProperty;
public class GetVnfWorkflowRelationRequest {
+
+ @JsonProperty("vnfsDetails")
+ private List<VnfDetails> vnfsDetails;
public GetVnfWorkflowRelationRequest() {
}
@@ -32,9 +36,6 @@ public class GetVnfWorkflowRelationRequest {
public GetVnfWorkflowRelationRequest(List<VnfDetails> vnfsDetails) {
this.vnfsDetails = vnfsDetails;
}
-
- @JsonProperty("vnfsDetails")
- private List<VnfDetails> vnfsDetails;
@JsonProperty("vnfsDetails")
public List<VnfDetails> getVnfDetails() {
diff --git a/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java b/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java
index 36570daf3..4f666b708 100644
--- a/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java
+++ b/vid-app-common/src/main/java/org/onap/vid/changeManagement/LeanCloudConfiguration.java
@@ -28,6 +28,12 @@ import org.onap.vid.mso.model.CloudConfiguration;
*/
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class LeanCloudConfiguration {
+
+ public String lcpCloudRegionId;
+
+ public String tenantId;
+
+ public String cloudOwner;
public LeanCloudConfiguration() {
}
@@ -38,10 +44,5 @@ public class LeanCloudConfiguration {
this.cloudOwner = cloudConfiguration.getCloudOwner();
}
- public String lcpCloudRegionId;
-
- public String tenantId;
-
- public String cloudOwner;
}
diff --git a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java
index b3ab75b23..b5c2dd74b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java
+++ b/vid-app-common/src/main/java/org/onap/vid/job/impl/JobSchedulerInitializer.java
@@ -46,6 +46,14 @@ public class JobSchedulerInitializer {
private FeatureManager featureManager;
private JobCommandFactory jobCommandFactory;
private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(JobSchedulerInitializer.class);
+ public static final List<Job.JobStatus> WORKERS_TOPICS = ImmutableList.of(
+ Job.JobStatus.PENDING,
+ Job.JobStatus.CREATING,
+ Job.JobStatus.IN_PROGRESS,
+ Job.JobStatus.RESOURCE_IN_PROGRESS,
+ Job.JobStatus.PENDING_RESOURCE
+ );
+
@Autowired
public JobSchedulerInitializer(
@@ -61,14 +69,6 @@ public class JobSchedulerInitializer {
}
- public static final List<Job.JobStatus> WORKERS_TOPICS = ImmutableList.of(
- Job.JobStatus.PENDING,
- Job.JobStatus.CREATING,
- Job.JobStatus.IN_PROGRESS,
- Job.JobStatus.RESOURCE_IN_PROGRESS,
- Job.JobStatus.PENDING_RESOURCE
- );
-
@PostConstruct
public void init() {
WORKERS_TOPICS.forEach(topic->scheduleJobWorker(topic, 1));
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
index 9b890478f..b50dcc3b5 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AaiServiceImpl.java
@@ -42,7 +42,6 @@ import org.apache.http.HttpStatus;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.onap.vid.aai.AaiClientInterface;
import org.onap.vid.aai.AaiGetVnfResponse;
-import org.onap.vid.aai.AaiOverTLSClientInterface;
import org.onap.vid.aai.AaiResponse;
import org.onap.vid.aai.AaiResponseTranslator;
import org.onap.vid.aai.ExceptionWithRequestInfo;
diff --git a/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
index 7818837f1..d7b3ac602 100644
--- a/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
+++ b/vid-app-common/src/main/java/org/onap/vid/services/AsyncInstantiationBusinessLogicImpl.java
@@ -39,7 +39,6 @@ import org.apache.commons.lang3.StringUtils;
import org.hibernate.SessionFactory;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
import org.onap.vid.aai.AaiClientInterface;
-import org.onap.vid.aai.ExceptionWithRequestInfo;
import org.onap.vid.aai.model.ResourceType;
import org.onap.vid.dal.AsyncInstantiationRepository;
import org.onap.vid.exceptions.DbFailureUncheckedException;
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
index 6eed08033..7fa312ed9 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/controller/InstantiationController.js
@@ -142,13 +142,13 @@
}
return null;
- }
+ };
$scope.hasVfModules = function (vnfInstance) {
if ($scope.returnVfModules(vnfInstance) != null) {
return true;
}
return false;
- }
+ };
$scope.returnVolumeGroups = function (vnfInstance) {
var svcModel = $scope.service.convertedModel;
@@ -183,13 +183,13 @@
}
return null;
- }
+ };
$scope.hasVolumeGroups = function (vnfInstance) {
if ($scope.returnVolumeGroups(vnfInstance) != null) {
return true;
}
return false;
- }
+ };
$scope.deleteNetwork = function (serviceObject, network) {
console.log("Removing Network " + network.name);
@@ -871,7 +871,7 @@
//Display popup with additional VF-Module information
DataService.setVfModuleInstanceId(vfModule[FIELD.ID.VF_MODULE_ID]);
- DataService.setInventoryItem(vfModule)
+ DataService.setInventoryItem(vfModule);
DataService.setSubscriberName(serviceObject[COMPONENT.SUBSCRIBER_NAME]);
DataService.setServiceType(serviceObject[COMPONENT.SERVICE_TYPE]);
@@ -1323,7 +1323,7 @@
var deleteCallbackFunction = function () {
console.log('hi')
- }
+ };
$scope.resetProgress = function () {
$scope.percentProgress = 0;
@@ -1364,13 +1364,13 @@
else {
return true;
}
- }
+ };
$scope.isMacro = function () {
return $scope.service && AsdcService.isMacro($scope.service.model);
- }
+ };
$scope.reloadRoute = function () {
$route.reload();
- }
+ };
/*
@@ -1539,7 +1539,7 @@ Private metthods
+ FIELD.STATUS.IS_SUCCESSFUL + response.isSuccessful;
if (response.isSuccessful) {
color = FIELD.ID.COLOR_8F8;
- $location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH)
+ $location.path(COMPONENT.SERVICEMODELS_MODELS_SERVICES_PATH);
} else {
color = FIELD.ID.COLOR_F88;
}