Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Use Set for Subnet's NodeConnectors
[controller.git]
/
opendaylight
/
switchmanager
/
api
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
switchmanager
/
SubnetConfig.java
diff --git
a/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
b/opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
index 87dd99da7f80736c76fc2e31765e84d46667fd35..4ed9934b27a3f6d3105c2854c86c48f131fe40c6 100644
(file)
--- a/
opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
+++ b/
opendaylight/switchmanager/api/src/main/java/org/opendaylight/controller/switchmanager/SubnetConfig.java
@@
-34,7
+34,7
@@
import org.opendaylight.controller.sal.utils.NodeConnectorCreator;
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class SubnetConfig implements Serializable {
+public class SubnetConfig implements
Cloneable,
Serializable {
//static fields are by default excluded by Gson parser
private static final long serialVersionUID = 1L;
private static final String prettyFields[] = { GUIField.NAME.toString(),
//static fields are by default excluded by Gson parser
private static final long serialVersionUID = 1L;
private static final String prettyFields[] = { GUIField.NAME.toString(),
@@
-48,23
+48,29
@@
public class SubnetConfig implements Serializable {
private String subnet; // A.B.C.D/MM Where A.B.C.D is the Default
// Gateway IP (L3) or ARP Querier IP (L2
@XmlElement
private String subnet; // A.B.C.D/MM Where A.B.C.D is the Default
// Gateway IP (L3) or ARP Querier IP (L2
@XmlElement
- private
Lis
t<String> nodePorts; // datapath ID/port list:
+ private
Se
t<String> nodePorts; // datapath ID/port list:
// xx:xx:xx:xx:xx:xx:xx:xx/a,b,c-m,r-t,y
public SubnetConfig() {
}
// xx:xx:xx:xx:xx:xx:xx:xx/a,b,c-m,r-t,y
public SubnetConfig() {
}
- public SubnetConfig(String desc, String sub,
Lis
t<String> sp) {
+ public SubnetConfig(String desc, String sub,
Se
t<String> sp) {
name = desc;
subnet = sub;
nodePorts = sp;
}
name = desc;
subnet = sub;
nodePorts = sp;
}
+ public SubnetConfig(SubnetConfig subnetConfig) {
+ name = subnetConfig.name;
+ subnet = subnetConfig.subnet;
+ nodePorts = new HashSet<String>(subnetConfig.nodePorts);
+ }
+
public String getName() {
return name;
}
public String getName() {
return name;
}
- public
Lis
t<String> getNodePorts() {
+ public
Se
t<String> getNodePorts() {
return nodePorts;
}
return nodePorts;
}
@@
-231,8
+237,18
@@
public class SubnetConfig implements Serializable {
nodePorts.remove(sp);
}
nodePorts.remove(sp);
}
+ @Override
public String toString() {
public String toString() {
- return ("Subnet
Config [Description=" + name + "
Subnet=" + subnet
- + " NodeConnectors=" + nodePorts + "]");
+ return ("Subnet
Config [Description=" + name + ",
Subnet=" + subnet
+ + "
,
NodeConnectors=" + nodePorts + "]");
}
}
+
+ /**
+ * Implement clonable interface
+ */
+ @Override
+ public SubnetConfig clone() {
+ return new SubnetConfig(this);
+ }
+
}
}