diff options
| author |   Paira, Saurav (sp694w) sp694w@att.com <sp694w@att.com> | 2018-12-13 13:41:05 +0000 |
|---|---|---|
| committer | Paira, Saurav (sp694w) sp694w@att.com <sp694w@att.com> | 2018-12-13 13:41:05 +0000 |
| commit | 7dd0b63f487097cf8e49081893987677bb5b6407 (patch) | |
| tree | 10036d5673b06f964a64e4085bce42eb6ee8da17 /ms/vlantag-api/src/main | |
| parent | 9321f6dea8f57f3e1b9a05c446e59d243f94bfc5 (diff) | |
Added the support for Shared-Range Policy Flag
With Shared-Range Flag multiple Keys can share the same vlantag value
Change-Id: I62c9f1ebb504430f0b0fe2932cd26dffa5cc4aed
Issue-ID: CCSDK-823
Signed-off-by: Paira, Saurav (sp694w) sp694w@att.com <sp694w@att.com>
Diffstat (limited to 'ms/vlantag-api/src/main')
2 files changed, 21 insertions, 6 deletions
diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/Elements.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/Elements.java index 20604634..5ad8561e 100644 --- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/Elements.java +++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/extinf/pm/model/Elements.java @@ -40,6 +40,9 @@ public class Elements { @JsonProperty("allowed-range")
private List<AllowedRanges> allowedRanges;
+ @JsonProperty("shared-range")
+ private String sharedRange;
+
@JsonProperty("element-vlan-role")
String elementVlanRole;
@@ -76,7 +79,15 @@ public class Elements { this.allowedRanges = allowedRanges;
}
- public String getElementVlanRole() {
+ public String getSharedRange() {
+ return sharedRange;
+ }
+
+ public void setSharedRange(String sharedRange) {
+ this.sharedRange = sharedRange;
+ }
+
+ public String getElementVlanRole() {
return elementVlanRole;
}
@@ -84,12 +95,14 @@ public class Elements { this.elementVlanRole = elementVlanRole;
}
- @Override
- public String toString() {
- return "Elements [recycleVlantagRange=" + recycleVlantagRange + ", overwrite=" + overwrite + ", vlantagName="
- + vlantagName + ", allowedRanges=" + allowedRanges + ", elementVlanRole=" + elementVlanRole + "]";
- }
+ @Override
+ public String toString() {
+ return "Elements [recycleVlantagRange=" + recycleVlantagRange + ", overwrite=" + overwrite + ", vlantagName="
+ + vlantagName + ", allowedRanges=" + allowedRanges + ", sharedRange=" + sharedRange
+ + ", elementVlanRole=" + elementVlanRole + "]";
+ }
+
diff --git a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java index 358241eb..93f8a21e 100644 --- a/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java +++ b/ms/vlantag-api/src/main/java/org/onap/ccsdk/apps/ms/vlantagapi/core/service/VlantagApiServiceImpl.java @@ -165,6 +165,8 @@ public class VlantagApiServiceImpl implements VlantagApiService { rr.applicationId = "SDNC";
rr.rangeMaxOverride = -1;
rr.rangeMinOverride = -1;
+ if("TRUE".equalsIgnoreCase(element.getSharedRange()))
+ rr.resourceShareGroup = input.getScopeId();
List<Range> rangeList = new ArrayList<>();
for (AllowedRanges allowedRange : element.getAllowedRanges()) {
|