Adjusted key name to the JSON value 41/841/1
authorBrent Salisbury <brent.salisbury@gmail.com>
Fri, 9 Aug 2013 08:06:58 +0000 (04:06 -0400)
committerBrent Salisbury <brent.salisbury@gmail.com>
Sun, 11 Aug 2013 04:50:17 +0000 (00:50 -0400)
as recommended by Madhu, member still overlaps with the protocol so stays as unique. Ty Madhu

Signed-off-by: Brent Salisbury <brent.salisbury@gmail.com>
15 files changed:
ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/BridgeInfo.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/ControllerInfo.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/Data.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/InterfaceInfo.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/ManagerInfo.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/New.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/OvsTable.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/OvsTableInfo.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java [new file with mode: 0644]
ovsdb/src/main/java/org/opendaylight/ovsdb/table/PortInfo.java [new file with mode: 0644]
ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java
new file mode 100644 (file)
index 0000000..a91700d
--- /dev/null
@@ -0,0 +1,63 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Bridge {
+
+    Map<String, BridgeInfo> bridgeInfo = new HashMap<String, BridgeInfo>();
+
+    private Map<String, BridgeInfo> getBridgeInfo() {
+        return bridgeInfo;
+    }
+
+    private void setBridgeInfo(Map<String, BridgeInfo> bridgeInfo) {
+        this.bridgeInfo = bridgeInfo;
+    }
+
+    @JsonAnySetter
+    private void add(String key, BridgeInfo value) {
+        bridgeInfo.put(key, value);
+    }
+
+    @JsonAnyGetter
+    private Map<String, BridgeInfo> getProperties() {
+        return bridgeInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "Bridge [bridgeInfo=" + bridgeInfo + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((bridgeInfo == null) ? 0 : bridgeInfo.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Bridge other = (Bridge) obj;
+        if (bridgeInfo == null) {
+            if (other.bridgeInfo != null)
+                return false;
+        } else if (!bridgeInfo.equals(other.bridgeInfo))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/BridgeInfo.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/BridgeInfo.java
new file mode 100644 (file)
index 0000000..1d94c56
--- /dev/null
@@ -0,0 +1,46 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class BridgeInfo {
+    @JsonProperty("new")
+    private New unique;
+
+    private New getKey() {
+        return unique;
+    }
+
+    private void setNew(New unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public String toString() {
+        return "BridgeInfo [new=" + unique + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        BridgeInfo other = (BridgeInfo) obj;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java
new file mode 100644 (file)
index 0000000..f39361c
--- /dev/null
@@ -0,0 +1,61 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Controller {
+
+    Map<String, ControllerInfo> controllerInfo = new HashMap<String, ControllerInfo>();
+
+    private Map<String, ControllerInfo> getControllerInfo() {
+        return controllerInfo;
+    }
+
+    private void setControllerInfo(Map<String, ControllerInfo> controllerInfo) {
+        this.controllerInfo = controllerInfo;
+    }
+
+    @JsonAnySetter
+    private void add(String key, ControllerInfo value) {
+        controllerInfo.put(key, value);
+    }
+
+    @JsonAnyGetter
+    private Map<String, ControllerInfo> getProperties() {
+        return controllerInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "Controller [controllerInfo=" + controllerInfo + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((controllerInfo == null) ? 0 : controllerInfo.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Controller other = (Controller) obj;
+        if (controllerInfo == null) {
+            if (other.controllerInfo != null)
+                return false;
+        } else if (!controllerInfo.equals(other.controllerInfo))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/ControllerInfo.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/ControllerInfo.java
new file mode 100644 (file)
index 0000000..6ddd375
--- /dev/null
@@ -0,0 +1,48 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ControllerInfo {
+
+    @JsonProperty("new")
+    private New unique;
+
+    private New getNew() {
+        return unique;
+    }
+
+    private void setNew(New unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public String toString() {
+        return "ControllerInfo [new="
+                + unique + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ControllerInfo other = (ControllerInfo) obj;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Data.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Data.java
new file mode 100644 (file)
index 0000000..123ad08
--- /dev/null
@@ -0,0 +1,147 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+/*
+ * Adding as a root reference,table
+ * POJOs will likely be called individually
+*/
+
+public class Data {
+
+    @JsonProperty("Port")
+    private Port Port;
+    @JsonProperty("Controller")
+    private Controller Controller;
+    @JsonProperty("Interface")
+    private Interface Interface;
+    @JsonProperty("OpenvSwitch")
+    private OvsTable OvsTable;
+    @JsonProperty("Manager")
+    private Manager Manager;
+    @JsonProperty("Bridge")
+    private Bridge Bridge;
+
+    private Port getPort() {
+        return Port;
+    }
+
+    private void setPort(Port port) {
+        Port = port;
+    }
+
+    private Controller getController() {
+        return Controller;
+    }
+
+    private void setController(Controller controller) {
+        Controller = controller;
+    }
+
+    private Interface getInterface() {
+        return Interface;
+    }
+
+    private void setInterface(Interface anInterface) {
+        Interface = anInterface;
+    }
+
+    private OvsTable getOvsTable() {
+        return OvsTable;
+    }
+
+    private void setOvsTable(OvsTable ovsTable) {
+        OvsTable = ovsTable;
+    }
+
+    private Manager getManager() {
+        return Manager;
+    }
+
+    private void setManager(Manager manager) {
+        Manager = manager;
+    }
+
+    private Bridge getBridge() {
+        return Bridge;
+    }
+
+    private void setBridge(Bridge bridge) {
+        Bridge = bridge;
+    }
+
+    @Override
+    public String toString() {
+        return "Data{" +
+                "port=" + Port +
+                ", Bridge=" + Bridge +
+                ", Interface=" + Interface +
+                ", OvsTable=" + OvsTable +
+                ", Controller=" + Controller +
+                ", Manager=" + Manager +
+                '}';
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((Bridge == null) ? 0 : Bridge.hashCode());
+        result = prime * result
+                + ((Controller == null) ? 0 : Controller.hashCode());
+        result = prime * result
+                + ((Interface == null) ? 0 : Interface.hashCode());
+        result = prime * result + ((Manager == null) ? 0 : Manager.hashCode());
+        result = prime * result
+                + ((OvsTable == null) ? 0 : OvsTable.hashCode());
+        result = prime * result + ((Port == null) ? 0 : Port.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Data other = (Data) obj;
+        if (Bridge == null) {
+            if (other.Bridge != null)
+                return false;
+        } else if (!Bridge.equals(other.Bridge))
+            return false;
+        if (Controller == null) {
+            if (other.Controller != null)
+                return false;
+        } else if (!Controller.equals(other.Controller))
+            return false;
+        if (Interface == null) {
+            if (other.Interface != null)
+                return false;
+        } else if (!Interface.equals(other.Interface))
+            return false;
+        if (Manager == null) {
+            if (other.Manager != null)
+                return false;
+        } else if (!Manager.equals(other.Manager))
+            return false;
+        if (OvsTable == null) {
+            if (other.OvsTable != null)
+                return false;
+        } else if (!OvsTable.equals(other.OvsTable))
+            return false;
+        if (Port == null) {
+            if (other.Port != null)
+                return false;
+        } else if (!Port.equals(other.Port))
+            return false;
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java
new file mode 100644 (file)
index 0000000..4b1f880
--- /dev/null
@@ -0,0 +1,62 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Interface {
+
+    Map<String, InterfaceInfo> interfaceInfo = new HashMap<String, InterfaceInfo>();
+
+    private Map<String, InterfaceInfo> getInterfaceInfo() {
+        return interfaceInfo;
+    }
+
+    private void setInterfaceInfo(Map<String, InterfaceInfo> interfaceInfo) {
+        this.interfaceInfo = interfaceInfo;
+    }
+
+    @JsonAnySetter
+    private void add(String key, InterfaceInfo value) {
+        interfaceInfo.put(key, value);
+    }
+
+    @JsonAnyGetter
+    private Map<String, InterfaceInfo> getProperties() {
+        return interfaceInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "Interface [interfaceInfo=" + interfaceInfo + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((interfaceInfo == null) ? 0 : interfaceInfo.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Interface other = (Interface) obj;
+        if (interfaceInfo == null) {
+            if (other.interfaceInfo != null)
+                return false;
+        } else if (!interfaceInfo.equals(other.interfaceInfo))
+            return false;
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/InterfaceInfo.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/InterfaceInfo.java
new file mode 100644 (file)
index 0000000..d275e52
--- /dev/null
@@ -0,0 +1,47 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class InterfaceInfo {
+
+    @JsonProperty("new")
+    private New unique;
+
+    private New getNew() {
+        return unique;
+    }
+
+    private void setNew(New unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public String toString() {
+        return "InterfaceInfo [new=" + unique + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        InterfaceInfo other = (InterfaceInfo) obj;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java
new file mode 100644 (file)
index 0000000..7bc6d7b
--- /dev/null
@@ -0,0 +1,61 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Manager {
+
+    Map<String, ManagerInfo> managerInfo = new HashMap<String, ManagerInfo>();
+
+    private Map<String, ManagerInfo> getManagerInfo() {
+        return managerInfo;
+    }
+
+    private void setManagerInfo(Map<String, ManagerInfo> managerInfo) {
+        this.managerInfo = managerInfo;
+    }
+
+    @JsonAnySetter
+    private void add(String key, ManagerInfo value) {
+        managerInfo.put(key, value);
+    }
+
+    @JsonAnyGetter
+    private Map<String, ManagerInfo> getProperties() {
+        return managerInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "Manager [managerInfo=" + managerInfo + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((managerInfo == null) ? 0 : managerInfo.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Manager other = (Manager) obj;
+        if (managerInfo == null) {
+            if (other.managerInfo != null)
+                return false;
+        } else if (!managerInfo.equals(other.managerInfo))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/ManagerInfo.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/ManagerInfo.java
new file mode 100644 (file)
index 0000000..10d4d8b
--- /dev/null
@@ -0,0 +1,46 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ManagerInfo {
+    @JsonProperty("new")
+    private New unique;
+
+    private New getNew() {
+        return unique;
+    }
+
+    private void setNew(New unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public String toString() {
+        return "ManagerInfo [new=" + unique + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        ManagerInfo other = (ManagerInfo) obj;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/New.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/New.java
new file mode 100644 (file)
index 0000000..81abba8
--- /dev/null
@@ -0,0 +1,172 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+
+public class New {
+
+    @JsonProperty("interfaces")
+    private List<String> interfaces;
+    @JsonProperty("name")
+    private String name;
+    @JsonProperty("fake_bridge")
+    private boolean fake_bridge;
+    @JsonProperty("type")
+    private String type;
+    @JsonProperty("ovs_version")
+    private String ovs_version;
+    @JsonProperty("uuid")
+    private String uuid;
+    @JsonProperty("target")
+    private String target;
+    @JsonProperty("is_connected")
+    private boolean is_connected;
+
+    private List<String> getInterfaces() {
+        return interfaces;
+    }
+
+    private void setInterfaces(List<String> interfaces) {
+        this.interfaces = interfaces;
+    }
+
+    private String getName() {
+        return name;
+    }
+
+    private void setName(String name) {
+        this.name = name;
+    }
+
+    private boolean isFake_bridge() {
+        return fake_bridge;
+    }
+
+    private void setFake_bridge(boolean fake_bridge) {
+        this.fake_bridge = fake_bridge;
+    }
+
+    private String getType() {
+        return type;
+    }
+
+    private void setType(String type) {
+        this.type = type;
+    }
+
+    private String getOvs_version() {
+        return ovs_version;
+    }
+
+    private void setOvs_version(String ovs_version) {
+        this.ovs_version = ovs_version;
+    }
+
+    private String getUuid() {
+        return uuid;
+    }
+
+    private void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    private String getTarget() {
+        return target;
+    }
+
+    private void setTarget(String target) {
+        this.target = target;
+    }
+
+    private boolean isIs_connected() {
+        return is_connected;
+    }
+
+    private void setIs_connected(boolean is_connected) {
+        this.is_connected = is_connected;
+    }
+
+    @Override
+    public String toString() {
+        return "New{" +
+                "interfaces=" + interfaces +
+                ", name='" + name + '\'' +
+                ", fake_bridge=" + fake_bridge +
+                ", type='" + type + '\'' +
+                ", ovs_version='" + ovs_version + '\'' +
+                ", uuid='" + uuid + '\'' +
+                ", target='" + target + '\'' +
+                ", is_connected=" + is_connected +
+                '}';
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (fake_bridge ? 1231 : 1237);
+        result = prime * result
+                + ((interfaces == null) ? 0 : interfaces.hashCode());
+        result = prime * result + (is_connected ? 1231 : 1237);
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result
+                + ((ovs_version == null) ? 0 : ovs_version.hashCode());
+        result = prime * result + ((target == null) ? 0 : target.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        result = prime * result + ((uuid == null) ? 0 : uuid.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        New other = (New) obj;
+        if (fake_bridge != other.fake_bridge)
+            return false;
+        if (interfaces == null) {
+            if (other.interfaces != null)
+                return false;
+        } else if (!interfaces.equals(other.interfaces))
+            return false;
+        if (is_connected != other.is_connected)
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (ovs_version == null) {
+            if (other.ovs_version != null)
+                return false;
+        } else if (!ovs_version.equals(other.ovs_version))
+            return false;
+        if (target == null) {
+            if (other.target != null)
+                return false;
+        } else if (!target.equals(other.target))
+            return false;
+        if (type == null) {
+            if (other.type != null)
+                return false;
+        } else if (!type.equals(other.type))
+            return false;
+        if (uuid == null) {
+            if (other.uuid != null)
+                return false;
+        } else if (!uuid.equals(other.uuid))
+            return false;
+        return true;
+    }
+}
+
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/OvsTable.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/OvsTable.java
new file mode 100644 (file)
index 0000000..4da8ce2
--- /dev/null
@@ -0,0 +1,62 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+public class OvsTable {
+
+    Map<String, OvsTableInfo> ovstableInfo = new HashMap<String, OvsTableInfo>();
+
+    private Map<String, OvsTableInfo> getOvstableInfo() {
+        return ovstableInfo;
+    }
+
+    private void setOvstableInfo(Map<String, OvsTableInfo> ovstableInfo) {
+        this.ovstableInfo = ovstableInfo;
+    }
+
+    @JsonAnySetter
+    private void add(String key, OvsTableInfo value) {
+        ovstableInfo.put(key, value);
+    }
+
+    @JsonAnyGetter
+    private Map<String, OvsTableInfo> getProperties() {
+        return ovstableInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "OvsTable [ovstableInfo=" + ovstableInfo + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((ovstableInfo == null) ? 0 : ovstableInfo.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        OvsTable other = (OvsTable) obj;
+        if (ovstableInfo == null) {
+            if (other.ovstableInfo != null)
+                return false;
+        } else if (!ovstableInfo.equals(other.ovstableInfo))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/OvsTableInfo.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/OvsTableInfo.java
new file mode 100644 (file)
index 0000000..e6981aa
--- /dev/null
@@ -0,0 +1,48 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class OvsTableInfo {
+
+    @JsonProperty("new")
+    private New unique;
+
+    private New getNew() {
+        return unique;
+    }
+
+    private void setNew(New unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public String toString() {
+        return "OvsTableInfo [new=" + unique + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        OvsTableInfo other = (OvsTableInfo) obj;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java
new file mode 100644 (file)
index 0000000..902816e
--- /dev/null
@@ -0,0 +1,61 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
+import com.fasterxml.jackson.annotation.JsonAnySetter;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class Port {
+
+    Map<String, PortInfo> portInfo = new HashMap<String, PortInfo>();
+
+    private Map<String, PortInfo> getPortInfo() {
+        return portInfo;
+    }
+
+    private void setPortInfo(Map<String, PortInfo> portInfo) {
+        this.portInfo = portInfo;
+    }
+
+    @JsonAnySetter
+    private void add(String key, PortInfo value) {
+        portInfo.put(key, value);
+    }
+
+    @JsonAnyGetter
+    private Map<String, PortInfo> getProperties() {
+        return portInfo;
+    }
+
+    @Override
+    public String toString() {
+        return "Port [portInfo=" + portInfo + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result
+                + ((portInfo == null) ? 0 : portInfo.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        Port other = (Port) obj;
+        if (portInfo == null) {
+            if (other.portInfo != null)
+                return false;
+        } else if (!portInfo.equals(other.portInfo))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/PortInfo.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/PortInfo.java
new file mode 100644 (file)
index 0000000..deccc09
--- /dev/null
@@ -0,0 +1,47 @@
+package org.opendaylight.ovsdb.table;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class PortInfo {
+
+    @JsonProperty("new")
+    private New unique;
+
+    private New getNew() {
+        return unique;
+    }
+
+    private void setNew(New unique) {
+        this.unique = unique;
+    }
+
+    @Override
+    public String toString() {
+        return "PortInfo [new=" + unique + "]";
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((unique == null) ? 0 : unique.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        PortInfo other = (PortInfo) obj;
+        if (unique == null) {
+            if (other.unique != null)
+                return false;
+        } else if (!unique.equals(other.unique))
+            return false;
+        return true;
+    }
+}
\ No newline at end of file
index 623b7359b919776368df8d8d3a3492af9dab9123..b603779a3fc16a205a5337236f5dbf8e8f9866ed 100755 (executable)
@@ -24,7 +24,7 @@ public class OvsdbTestAddBridge {
         connectionService.init();\r
         String identifier = "TEST";\r
         Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();\r
-        params.put(ConnectionConstants.ADDRESS, "172.28.30.51");\r
+        params.put(ConnectionConstants.ADDRESS, "172.16.58.128");\r
         params.put(ConnectionConstants.PORT, "6634");\r
 \r
         Node node = connectionService.connect(identifier, params);\r