summaryrefslogtreecommitdiffstats
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/Vlan.java19
-rw-r--r--vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java27
-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/AsyncInstantiationBusinessLogicImpl.java1
4 files changed, 33 insertions, 30 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
index 8d19ad4a7..008f916ca 100644
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetNetworkCollectionDetails/Vlan.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.
@@ -26,7 +27,16 @@ import org.onap.vid.aai.model.interfaces.AaiModelWithRelationships;
@JsonIgnoreProperties(ignoreUnknown = true)
public class Vlan implements AaiModelWithRelationships {
+
+ @JsonProperty("vlan-interface")
+ private final String vlanInterface;
+ @JsonProperty("vlan-id-inner")
+ private final String vlanIdInner;
+
+ @JsonProperty("relationship-list")
+ public final RelationshipList relationshipList;
+
public Vlan(
@JsonProperty("vlan-interface") String vlanInterface,
@JsonProperty("vlan-id-inner") String vlanIdInner,
@@ -36,14 +46,7 @@ public class Vlan implements AaiModelWithRelationships {
this.relationshipList = relationshipList;
}
- @JsonProperty("vlan-interface")
- private final String vlanInterface;
-
- @JsonProperty("vlan-id-inner")
- private final String vlanIdInner;
-
- @JsonProperty("relationship-list")
- public final RelationshipList relationshipList;
+
public String getVlanInterface() {
return vlanInterface;
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java
index 7980ece5a..51766413f 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/beans/tosca/Input.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.
@@ -31,16 +32,11 @@ import java.util.List;
* The Class Input.
*/
public class Input {
-
- public Input(org.onap.sdc.toscaparser.api.parameters.Input input, List<Property> properties){
- this.type = input.getType();
- this.description = input.getDescription();
- this._default = input.getDefault();
- this.inputProperties = new InputProperties(properties);
- this.fromInputName = input.getName();
- }
-
- /** The type. */
+
+ /** The entry schema. */
+ private Input entry_schema;
+
+ /** The type. */
private String type;
/** The description. */
@@ -48,9 +44,6 @@ public class Input {
/** The default. */
private Object _default;
-
- /** The entry schema. */
- private Input entry_schema;
private InputProperties inputProperties;
@@ -68,6 +61,14 @@ public class Input {
private String templateInvariantUUID;
private String templateCustomizationUUID;
+ public Input(org.onap.sdc.toscaparser.api.parameters.Input input, List<Property> properties){
+ this.type = input.getType();
+ this.description = input.getDescription();
+ this._default = input.getDefault();
+ this.inputProperties = new InputProperties(properties);
+ this.fromInputName = input.getName();
+ }
+
/**
* Instantiates a new input.
*/
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/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;