summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmso-database/pom.xml2
-rw-r--r--cmso-optimizer/pom.xml2
-rw-r--r--cmso-optimizer/src/main/resources/META-INF/resources/swagger/swagger.json2
-rw-r--r--cmso-robot/pom.xml2
-rw-r--r--cmso-service/pom.xml2
-rw-r--r--cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json30
-rw-r--r--cmso-sonar/pom.xml2
-rw-r--r--cmso-ticketmgt/pom.xml2
-rw-r--r--cmso-ticketmgt/src/main/resources/META-INF/resources/swagger/swagger.json2
-rw-r--r--cmso-topology/pom.xml2
-rw-r--r--cmso-topology/src/main/resources/META-INF/resources/swagger/swagger.json2
-rw-r--r--pom.xml2
-rw-r--r--version.properties4
13 files changed, 22 insertions, 34 deletions
diff --git a/cmso-database/pom.xml b/cmso-database/pom.xml
index ec2df36..4d27a21 100644
--- a/cmso-database/pom.xml
+++ b/cmso-database/pom.xml
@@ -36,7 +36,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso</groupId>
diff --git a/cmso-optimizer/pom.xml b/cmso-optimizer/pom.xml
index e63e84e..5c83477 100644
--- a/cmso-optimizer/pom.xml
+++ b/cmso-optimizer/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso.optimizer</groupId>
diff --git a/cmso-optimizer/src/main/resources/META-INF/resources/swagger/swagger.json b/cmso-optimizer/src/main/resources/META-INF/resources/swagger/swagger.json
index 037bfea..26b710f 100644
--- a/cmso-optimizer/src/main/resources/META-INF/resources/swagger/swagger.json
+++ b/cmso-optimizer/src/main/resources/META-INF/resources/swagger/swagger.json
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
- "version" : "2.1.1-SNAPSHOT",
+ "version" : "2.2.0-SNAPSHOT",
"title" : "cmso-optimizer"
},
"basePath" : "/optimizer",
diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml
index a0a7ec5..9c31efa 100644
--- a/cmso-robot/pom.xml
+++ b/cmso-robot/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso</groupId>
diff --git a/cmso-service/pom.xml b/cmso-service/pom.xml
index 2e8772c..f3df62e 100644
--- a/cmso-service/pom.xml
+++ b/cmso-service/pom.xml
@@ -30,7 +30,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso.service</groupId>
diff --git a/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json b/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json
index f987661..0b657d4 100644
--- a/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json
+++ b/cmso-service/src/main/resources/META-INF/resources/swagger/swagger.json
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
- "version" : "2.1.1-SNAPSHOT",
+ "version" : "2.2.0-SNAPSHOT",
"title" : "cmso-service"
},
"basePath" : "/cmso",
@@ -774,25 +774,15 @@
"format" : "int32",
"description" : "Maximum number of VNF changes to schedule concurrently"
},
- "changeWindows" : {
- "type" : "array",
- "description" : "Lists of desired change windows to schedule the elements.",
- "items" : {
- "$ref" : "#/definitions/Change Window"
- }
- },
- "policies" : {
- "type" : "array",
- "description" : "List of the policies to control optimization.",
- "items" : {
- "$ref" : "#/definitions/Supported Policy Information"
- }
+ "policyId" : {
+ "type" : "string",
+ "description" : "Name of schedule optimization policy used by the change management cmso optimizer to determine available time slot"
},
- "elements" : {
+ "vnfDetails" : {
"type" : "array",
"description" : "Lists of the VNFs to be changed and the desired change windows",
"items" : {
- "$ref" : "#/definitions/Optimizer Element"
+ "$ref" : "#/definitions/VNF Details"
}
}
},
@@ -803,16 +793,14 @@
"properties" : {
"startTime" : {
"type" : "string",
- "format" : "date-time",
- "description" : "Earliest time for which changes may begin."
+ "description" : "Earliest time that a set of changes may begin."
},
"endTime" : {
"type" : "string",
- "format" : "date-time",
- "description" : "Latest time by which all changes must be completed."
+ "description" : "Latest time by which all changes must be completed"
}
},
- "description" : "Time window for which tickets are to returned"
+ "description" : "Time window within which the scheduler optimizer can schedule the changes for the group of NVFs"
},
"CmDetailsMessage" : {
"type" : "object",
diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index 65ca2c4..7bcd0a9 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso.sonar</groupId>
diff --git a/cmso-ticketmgt/pom.xml b/cmso-ticketmgt/pom.xml
index 3ea303a..0eb1ebd 100644
--- a/cmso-ticketmgt/pom.xml
+++ b/cmso-ticketmgt/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso.ticketmgt</groupId>
diff --git a/cmso-ticketmgt/src/main/resources/META-INF/resources/swagger/swagger.json b/cmso-ticketmgt/src/main/resources/META-INF/resources/swagger/swagger.json
index 0580b82..8d9b574 100644
--- a/cmso-ticketmgt/src/main/resources/META-INF/resources/swagger/swagger.json
+++ b/cmso-ticketmgt/src/main/resources/META-INF/resources/swagger/swagger.json
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
- "version" : "2.1.1-SNAPSHOT",
+ "version" : "2.2.0-SNAPSHOT",
"title" : "cmso-ticketmgt"
},
"basePath" : "/ticketmgt",
diff --git a/cmso-topology/pom.xml b/cmso-topology/pom.xml
index 2eeae18..6ffc597 100644
--- a/cmso-topology/pom.xml
+++ b/cmso-topology/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.optf.cmso.topology</groupId>
diff --git a/cmso-topology/src/main/resources/META-INF/resources/swagger/swagger.json b/cmso-topology/src/main/resources/META-INF/resources/swagger/swagger.json
index 5d41ba3..035f1cd 100644
--- a/cmso-topology/src/main/resources/META-INF/resources/swagger/swagger.json
+++ b/cmso-topology/src/main/resources/META-INF/resources/swagger/swagger.json
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
- "version" : "2.1.1-SNAPSHOT",
+ "version" : "2.2.0-SNAPSHOT",
"title" : "cmso-topology"
},
"basePath" : "/topology",
diff --git a/pom.xml b/pom.xml
index c0b2606..fdb5b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,7 @@
<groupId>org.onap.optf.cmso</groupId>
<artifactId>cmso</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>optf-cmso</name>
diff --git a/version.properties b/version.properties
index 61ee5ea..8723631 100644
--- a/version.properties
+++ b/version.properties
@@ -26,8 +26,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=2
-minor=1
-patch=1
+minor=2
+patch=0
base_version=${major}.${minor}.${patch}