summaryrefslogtreecommitdiffstats
path: root/common/src/main/java/org
diff options
context:
space:
mode:
authorhetengjiao <hetengjiao@chinamobile.com>2020-11-04 11:07:30 +0800
committerHE TENGJIAO <hetengjiao@chinamobile.com>2020-11-04 06:45:50 +0000
commit86348f496d1a2f0d6884f8f11dbb637f5b339291 (patch)
tree5f49f2e4db7ab752fea841fa3048eb64ba0b2872 /common/src/main/java/org
parentca38d83d2e3eb976ef66d2c222e5a0c22617dc54 (diff)
fixed nssmf adapter ssl problem and some bugs of nsmf workflow
Issue-ID: SO-2963 Signed-off-by: hetengjiao <hetengjiao@chinamobile.com> Change-Id: I018ca93da483231db1a20aac0e6146b1e2314ed3
Diffstat (limited to 'common/src/main/java/org')
-rw-r--r--common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java2
-rw-r--r--common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java2
-rw-r--r--common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java8
3 files changed, 5 insertions, 7 deletions
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java
index 71c50c1684..9b6406d57f 100644
--- a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskInfo.java
@@ -40,7 +40,7 @@ public class SliceTaskInfo<T> implements Serializable {
private T sliceProfile;
- private TemplateInfo NSSTInfo;
+ private TemplateInfo NSSTInfo = new TemplateInfo();
private String sliceInstanceId;
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java b/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java
index 292a0d5ae4..ee3d8aecf8 100644
--- a/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/oof/RequestInfo.java
@@ -40,7 +40,7 @@ public class RequestInfo implements Serializable {
private Integer numSolutions;
- private Integer timeout;
+ private Object timeout;
private Map<?, ?> addtnlArgs;
}
diff --git a/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java b/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java
index 4b0136a798..536bb04fce 100644
--- a/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java
+++ b/common/src/main/java/org/onap/so/beans/nsmf/oof/SubnetType.java
@@ -26,15 +26,13 @@ import org.onap.so.beans.nsmf.NetworkType;
public enum SubnetType {
AN("AN", NetworkType.ACCESS),
- AN_NF("AN-NF", NetworkType.ACCESS),
-
CN("CN", NetworkType.CORE),
- TN_FH("TN-FH", NetworkType.TRANSPORT),
+ TN_FH("TN_FH", NetworkType.TRANSPORT),
- TN_MH("TN-MH", NetworkType.TRANSPORT),
+ TN_MH("TN_MH", NetworkType.TRANSPORT),
- TN_BH("TN-BH", NetworkType.TRANSPORT),;
+ TN_BH("TN_BH", NetworkType.TRANSPORT),;
private NetworkType networkType;