Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "524 bug - %2F slashes translation behind mount point (unit test)"
[controller.git]
/
opendaylight
/
networkconfiguration
/
neutron
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
networkconfig
/
neutron
/
NeutronNetwork.java
diff --git
a/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
b/opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
index 9d7ba5d58a8535dec530c37e4e29c2c821031fec..5b35dc2b34ff73519e4350fa7070ec06cf60801d 100644
(file)
--- a/
opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
+++ b/
opendaylight/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
@@
-8,6
+8,7
@@
package org.opendaylight.controller.networkconfig.neutron;
package org.opendaylight.controller.networkconfig.neutron;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@
-17,13
+18,17
@@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import org.opendaylight.controller.configuration.ConfigurationObject;
+
@XmlRootElement(name = "network")
@XmlAccessorType(XmlAccessType.NONE)
@XmlRootElement(name = "network")
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronNetwork {
+public class NeutronNetwork
extends ConfigurationObject implements Serializable
{
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
+ private static final long serialVersionUID = 1L;
+
@XmlElement (name="id")
String networkUUID; // network UUID
@XmlElement (name="id")
String networkUUID; // network UUID