From 9b522f94b6e96713f8535595a37d4bb55061dc76 Mon Sep 17 00:00:00 2001 From: Suchi Raman Date: Sat, 18 Jan 2014 10:51:25 -0500 Subject: [PATCH] Fix Northbound API annotations. Signed-off-by: Suchi Raman --- .../opendaylight/affinity/affinity/AffinityLink.java | 12 ++++++++++-- scripts/affinity.py | 5 ----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java index 5731c7e..028127a 100644 --- a/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java +++ b/affinity/api/src/main/java/org/opendaylight/affinity/affinity/AffinityLink.java @@ -95,7 +95,7 @@ public class AffinityLink implements Cloneable, Serializable { } /* Get the waypoint address */ - @JsonIgnore + @XmlElement(name="waypoint") public AffinityAttribute getWaypoint() { return attrlist.get(AffinityAttributeType.SET_PATH_REDIRECT); } @@ -135,7 +135,7 @@ public class AffinityLink implements Cloneable, Serializable { } /* tbd requires nb method. */ - @JsonIgnore + @XmlElement(name="tapList") public List getTapList() { // Check if a tap attribute is already available on this link. SetTap tap = (SetTap) attrlist.get(AffinityAttributeType.SET_TAP); @@ -145,6 +145,7 @@ public class AffinityLink implements Cloneable, Serializable { return null; } + @XmlElement(name="deny") public boolean isDeny() { return attrlist.containsKey(AffinityAttributeType.SET_DENY); } @@ -160,6 +161,11 @@ public class AffinityLink implements Cloneable, Serializable { attrlist.remove(AffinityAttributeType.SET_DENY); } + @XmlElement(name="isolate") + public boolean isIsolate() { + return attrlist.containsKey(AffinityAttributeType.SET_PATH_ISOLATE); + } + // Mark this with "isolate" public void setIsolate() { SetPathIsolate iso = new SetPathIsolate(); @@ -169,9 +175,11 @@ public class AffinityLink implements Cloneable, Serializable { attrlist.remove(AffinityAttributeType.SET_PATH_ISOLATE); } + @XmlElement(name="fromGroup") public AffinityGroup getFromGroup() { return this.fromGroup; } + @XmlElement(name="toGroup") public AffinityGroup getToGroup() { return this.toGroup; } diff --git a/scripts/affinity.py b/scripts/affinity.py index 353ab19..b1cb9ab 100644 --- a/scripts/affinity.py +++ b/scripts/affinity.py @@ -58,10 +58,6 @@ def get_affinity_link(linkname): for key in affyLinkCfg: print "%10s : %s" % (key, affyLinkCfg[key]) - - -# - def client_ws_example(): # Create two affinity groups print "create web servers group" @@ -154,7 +150,6 @@ def set_attr(): set_waypoint_address('inflows', '10.0.0.2') set_tap('inflows', '10.0.0.6') set_tap('inflows', '10.0.0.4') - get_affinity_link('inflows') # Change a few affinity attributes and get the new link configuration. -- 2.36.6