Schema changes for 1.7.0 support

This adds the following:
1. ACL.java for ACL table
2. ACLEntry.java for ACL_entries table
3. Reference to ACL table entry in LogicalRouter
4. Reference to ACL table entry in PhysicalPort
5. Add tunnel-key to PhysicalLocator
6. Add other-config to multiple classes as per 1.5.1 an 1.7.0
7. Add replication_mode to LogicalSwitch

Change-Id: I0af839a9792890d5a6b753b8e26fb3ffcc1678de
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ACL.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ACL.java
new file mode 100644 (file)
index 0000000..7167b0a
--- /dev/null
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ACL.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.ovsdb.schema.hardwarevtep;
+
+import java.util.Map;
+
+import org.opendaylight.ovsdb.lib.notation.Column;
+import org.opendaylight.ovsdb.lib.notation.UUID;
+import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
+import org.opendaylight.ovsdb.lib.schema.typed.MethodType;
+import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
+import org.opendaylight.ovsdb.lib.schema.typed.TypedColumn;
+import org.opendaylight.ovsdb.lib.schema.typed.TypedTable;
+
+@TypedTable(name="ACL", database="hardware_vtep", fromVersion="1.4.0")
+public interface ACL extends TypedBaseTable<GenericTableSchema> {
+    @TypedColumn(name="acl_name", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, String> getAclNameColumn();
+
+    @TypedColumn(name="acl_name", method=MethodType.GETDATA, fromVersion="1.4.0")
+    String getAclName();
+
+    @TypedColumn(name="acl_name", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAclName(String aclName);
+
+
+    @TypedColumn(name="acl_entries", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, UUID> getAclEntriesColumn();
+
+    @TypedColumn(name="acl_entries", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAclEntry(UUID aclEntry);
+
+
+    @TypedColumn(name="acl_fault_status", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Map<String, String>> getAclFaultStatusColumn();
+
+    @TypedColumn(name="acl_fault_status", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAclFaultStatus(Map<String, String> aclFaultStatus);
+}

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ACLEntry.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ACLEntry.java
new file mode 100644 (file)
index 0000000..a68ad9f
--- /dev/null
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/ACLEntry.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (c) 2016 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.ovsdb.schema.hardwarevtep;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.opendaylight.ovsdb.lib.notation.Column;
+import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
+import org.opendaylight.ovsdb.lib.schema.typed.MethodType;
+import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
+import org.opendaylight.ovsdb.lib.schema.typed.TypedColumn;
+import org.opendaylight.ovsdb.lib.schema.typed.TypedTable;
+
+@TypedTable(name="ACL_entry", database="hardware_vtep", fromVersion="1.4.0")
+public interface ACLEntry extends TypedBaseTable<GenericTableSchema> {
+    @TypedColumn(name="sequence", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Long> getSequenceColumn();
+
+    @TypedColumn(name="sequence", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setSequence(Long sequence);
+
+
+    @TypedColumn(name="source_mac", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getSourceMacColumn();
+
+    @TypedColumn(name="source_mac", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setSourceMac(Set<String> sourceMac);
+
+
+    @TypedColumn(name="dest_mac", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getDestMacColumn();
+
+    @TypedColumn(name="dest_mac", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setDestMac(Set<String> destMac);
+
+
+    @TypedColumn(name="ethertype", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getEtherTypeColumn();
+
+    @TypedColumn(name="ethertype", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setEtherType(Set<String> etherType);
+
+
+    @TypedColumn(name="source_ip", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getSourceIpColumn();
+
+    @TypedColumn(name="source_ip", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setSourceIp(Set<String> sourceIp);
+
+
+    @TypedColumn(name="source_mask", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getSourceMaskColumn();
+
+    @TypedColumn(name="source_mask", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setSourceMask(Set<String> sourceMask);
+
+
+    @TypedColumn(name="dest_ip", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getDestIpColumn();
+
+    @TypedColumn(name="dest_ip", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setDestIp(Set<String> destIp);
+
+
+    @TypedColumn(name="dest_mask", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getDestMaskColumn();
+
+    @TypedColumn(name="dest_mask", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setDestMask(Set<String> destMask);
+
+
+    @TypedColumn(name="protocol", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getProtocolColumn();
+
+    @TypedColumn(name="protocol", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setProtocol(Set<Long> protocol);
+
+
+    @TypedColumn(name="source_port_min", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getSourcePortMinColumn();
+
+    @TypedColumn(name="source_port_min", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setSourcePortMin(Set<Long> sourcePortMin);
+
+
+    @TypedColumn(name="source_port_max", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getSourcePortMaxColumn();
+
+    @TypedColumn(name="source_port_max", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setSourcePortMax(Set<Long> sourcePortMax);
+
+
+    @TypedColumn(name="dest_port_min", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getDestPortMinColumn();
+
+    @TypedColumn(name="dest_port_min", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setDestPortMin(Set<Long> destPortMin);
+
+
+    @TypedColumn(name="dest_port_max", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getDestPortMaxColumn();
+
+    @TypedColumn(name="dest_port_max", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setDestPortMax(Set<Long> destPortMax);
+
+
+    @TypedColumn(name="tcp_flags", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getTcpFlagsColumn();
+
+    @TypedColumn(name="tcp_flags", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setTcpFlags(Set<Long> tcpFlags);
+
+
+    @TypedColumn(name="tcp_flags_mask", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getTcpFlagsMaskColumn();
+
+    @TypedColumn(name="tcp_flags_mask", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setTcpFlagsMask(Set<Long> tcpFlagsMask);
+
+
+    @TypedColumn(name="icmp_code", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getIcmpCodeColumn();
+
+    @TypedColumn(name="icmp_code", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setIcmpCode(Set<Long> icmpCode);
+
+
+    @TypedColumn(name="icmp_type", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<Long>> getIcmpTypeColumn();
+
+    @TypedColumn(name="icmp_type", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setIcmpType(Set<Long> icmpType);
+
+
+    @TypedColumn(name="direction", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getDirectionColumn();
+
+    @TypedColumn(name="direction", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setDirection(Set<String> direction);
+
+
+    @TypedColumn(name="action", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Set<String>> getActionColumn();
+
+    @TypedColumn(name="action", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAction(Set<String> action);
+
+    @TypedColumn(name="acle_fault_status", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Map<String, String>> getAcleFaultStatusColumn();
+
+    @TypedColumn(name="acle_fault_status", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAcleFaultStatus(Map<String, String> acleFaultStatus);
+}

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java
index 2f8e71bf8f1853cd2c96376a33320ef9644041b4..b3f028f312705b04f275c2c676e9e1b9b83ad8d5 100644 (file)
--- a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Global.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.ovsdb.schema.hardwarevtep;
 
+import java.util.Map;
 import java.util.Set;
 
 import org.opendaylight.ovsdb.lib.notation.Column;
@@ -32,4 +33,11 @@ public interface Global extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="switches", method=MethodType.SETDATA, fromVersion="1.0.0")
     void setSwitches(Set<UUID> switches);
+
+
+    @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.7.0")
+    Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();
+
+    @TypedColumn(name="other_config", method=MethodType.SETDATA, fromVersion="1.7.0")
+    void setOtherConfig(Map<String, String> otherConfig);
 }

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java
index e35dc0dea1d40a6fc27590c8d72b7efc1eb8dbb8..7bfa9054a8e22fdfd1d6a72f99ede1db393a5cec 100644 (file)
--- a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalRouter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 Red Hat, Inc. and others. All rights reserved.
+ * Copyright (c) 2014, 2016 Red Hat, Inc. and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -52,4 +52,18 @@ public interface LogicalRouter extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="static_routes", method=MethodType.SETDATA, fromVersion="1.0.0")
     void setStaticRoutes(Map<String, String> staticRoutes);
+
+
+    @TypedColumn(name="acl_binding", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Map<String, UUID>> getAclBindingColumn();
+
+    @TypedColumn(name="acl_binding", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAclBinding(Map<String, UUID> aclBinding);
+
+
+    @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.5.1")
+    Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();
+
+    @TypedColumn(name="other_config", method=MethodType.SETDATA, fromVersion="1.5.1")
+    void setOtherConfig(Map<String, String> otherConfig);
 }
\ No newline at end of file

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
index 49daff04cf8e8ab0be0a143a181dc77eb60f30e5..5b1d6209856a4d02784100ab10f81d5c981289b8 100644 (file)
--- a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.ovsdb.schema.hardwarevtep;
 
+import java.util.Map;
 import java.util.Set;
 
 import org.opendaylight.ovsdb.lib.notation.Column;
@@ -44,4 +45,18 @@ public interface LogicalSwitch extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="tunnel_key", method=MethodType.SETDATA, fromVersion="1.0.0")
     void setTunnelKey(Set<Long> tunnelKey);
+
+
+    @TypedColumn(name="replication_mode", method=MethodType.GETCOLUMN, fromVersion="1.6.0")
+    Column<GenericTableSchema, Set<String>> getReplicationModeColumn();
+
+    @TypedColumn(name="replication_mode", method=MethodType.SETDATA, fromVersion="1.6.0")
+    void setReplicationMode(Set<String> replicationMode);
+
+
+    @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.5.1")
+    Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();
+
+    @TypedColumn(name="other_config", method=MethodType.SETDATA, fromVersion="1.5.1")
+    void setOtherConfig(Map<String, String> otherConfig);
 }
\ No newline at end of file

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java
index b133cf739ef3cb9a750fd14b7f29af6fb8c9c93a..83fe20e3d9e956aeb09512e7c54dc4ae63a3f434 100644 (file)
--- a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalLocator.java
@@ -9,6 +9,7 @@
 package org.opendaylight.ovsdb.schema.hardwarevtep;
 
 import java.util.Map;
+import java.util.Set;
 
 import org.opendaylight.ovsdb.lib.notation.Column;
 import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
@@ -42,4 +43,11 @@ public interface PhysicalLocator extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="bfd_status", method=MethodType.SETDATA, fromVersion="1.0.0", untilVersion="1.2.0")
     void setBfdStatus(Map<String, String> bfdStatus);
-}
\ No newline at end of file
+
+
+    @TypedColumn(name="tunnel_key", method=MethodType.GETCOLUMN, fromVersion="1.5.0")
+    Column<GenericTableSchema, Set<Long>> getTunnelKeyColumn();
+
+    @TypedColumn(name="tunnel_key", method=MethodType.SETDATA, fromVersion="1.5.0")
+    void setTunnelKey(Set<Long> tunnelKey);
+}

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
index 21ea95b572062330855b7ae666a992c1452fe939..964b9890ccc72985aacbaa0a1a1e6d3127553eb4 100644 (file)
--- a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015 Red Hat, Inc. and others. All rights reserved.
+ * Copyright (c) 2014, 2016 Red Hat, Inc. and others. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -48,6 +48,13 @@ public interface PhysicalPort extends TypedBaseTable<GenericTableSchema> {
     void setVlanBindings(Map<Long, UUID> vlanBindings);
 
 
+    @TypedColumn(name="acl_bindings", method=MethodType.GETCOLUMN, fromVersion="1.4.0")
+    Column<GenericTableSchema, Map<Long, UUID>> getAclBindingsColumn();
+
+    @TypedColumn(name="acl_bindings", method=MethodType.SETDATA, fromVersion="1.4.0")
+    void setAclBindings(Map<Long, UUID> aclBindings);
+
+
     @TypedColumn(name="vlan_stats", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     Column<GenericTableSchema, Map<Long, UUID>> getVlanStatsColumn();
 
@@ -55,6 +62,13 @@ public interface PhysicalPort extends TypedBaseTable<GenericTableSchema> {
     void setVlanStats(Map<Long, UUID> vlanStats);
 
 
+    @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.5.1")
+    Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();
+
+    @TypedColumn(name="other_config", method=MethodType.SETDATA, fromVersion="1.5.1")
+    void setOtherConfig(Map<String, String> otherConfig);
+
+
     @TypedColumn(name="port_fault_status", method=MethodType.GETCOLUMN, fromVersion="1.1.0")
     Column<GenericTableSchema, Set<String>> getPortFaultStatusColumn();
 

diff --git a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java
index 0f71e03505bb28f102463f0662595e50a1b22ecc..b6bd300e5ba1c95b9bbd82ea2fd0889bde6c7c22 100644 (file)
--- a/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java
+++ b/schemas/hardwarevtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalSwitch.java
@@ -8,6 +8,7 @@
 
 package org.opendaylight.ovsdb.schema.hardwarevtep;
 
+import java.util.Map;
 import java.util.Set;
 
 import org.opendaylight.ovsdb.lib.notation.Column;
@@ -67,6 +68,14 @@ public interface PhysicalSwitch extends TypedBaseTable<GenericTableSchema> {
     @TypedColumn(name="tunnels", method=MethodType.SETDATA, fromVersion="1.3.0")
     void setTunnels(Set<UUID> tunnels);
 
+
+    @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.5.1")
+    Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();
+
+    @TypedColumn(name="other_config", method=MethodType.SETDATA, fromVersion="1.5.1")
+    void setOtherConfig(Map<String, String> otherConfig);
+
+
     @TypedColumn(name="switch_fault_status", method=MethodType.GETCOLUMN, fromVersion="1.1.0")
     Column<GenericTableSchema, Set<String>> getSwitchFaultStatusColumn();