Bug 1334 - Change the Typed Classes in Open_vSwitch and hardware_vtep schema

- Fixed IT tests.
- Address review comments: removed some commented out lines
- Modified schema files to use Set<Long> instead of Set<Integer>
- Modified user files to use new schema

Change-Id: I471d5c69d9b6f03df97fabbae5ab743b4b9772a5
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
index e9e0c893ef42d4b53c7195d7138a691831654569..5f1a22bc1f3d2f5be303f2110a0583163de59109 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/library/OvsdbLibraryIT.java
@@ -138,7 +138,7 @@ public class OvsdbLibraryIT extends OvsdbIntegrationTestBase {
         Bridge bridge = client.createTypedRowWrapper(Bridge.class);
         bridge.setName(testBridgeName);
         bridge.setStatus(ImmutableMap.of("key","value"));
-        bridge.setFloodVlans(Sets.newHashSet(34));
+        bridge.setFloodVlans(Sets.newHashSet(34L));
 
         OpenVSwitch openVSwitch = client.createTypedRowWrapper(OpenVSwitch.class);
         openVSwitch.setBridges(Sets.newHashSet(new UUID(testBridgeName)));

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
index 44fc0b7e5e78a5640bf6e62e7bdfcc2c35f94712..db0395e65bfe3b5daa74301b10d95fab36bf6592 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/plugin/OvsdbPluginIT.java
@@ -195,7 +195,7 @@ public class OvsdbPluginIT extends OvsdbIntegrationTestBase {
         Bridge bridge = connection.getClient().createTypedRowWrapper(Bridge.class);
         bridge.setName("br_test1");
         bridge.setStatus(ImmutableMap.of("key", "value"));
-        bridge.setFloodVlans(Sets.newHashSet(34));
+        bridge.setFloodVlans(Sets.newHashSet(34L));
         return ovsdbConfigService.insertRow(node, bridge.getSchema().getName(), parentUuid, bridge.getRow());
     }
 

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
index 689143606baaf98f372fe845745a1175682dd4f6..60c2d5f055b11a10148268bcb812962046139bf8 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java
@@ -9,7 +9,6 @@
  */
 package org.opendaylight.ovsdb.neutron;
 
-import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -319,8 +318,8 @@ public class TenantNetworkManager implements ITenantNetworkManager {
         }
         OVSDBConfigService ovsdbTable = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
         Port port = ovsdbTable.createTypedRow(node, Port.class);
-        OvsDBSet<BigInteger> tags = new OvsDBSet<BigInteger>();
-        tags.add(BigInteger.valueOf(vlan));
+        OvsDBSet<Long> tags = new OvsDBSet<Long>();
+        tags.add(Long.valueOf(vlan));
         port.setTag(tags);
         ovsdbTable.updateRow(node, port.getSchema().getName(), null, portUUID, port.getRow());
         if (enableContainer) this.addPortToTenantNetworkContainer(node, portUUID, network);
@@ -357,16 +356,16 @@ public class TenantNetworkManager implements ITenantNetworkManager {
             for (UUID intfUUID : interfaces) {
                 Interface intf = (Interface)ovsdbTable.getRow(node,ovsdbTable.getTableName(node, Interface.class), intfUUID.toString());
                 if (intf == null) continue;
-                Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+                Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
                 if (of_ports == null) continue;
-                for (Integer of_port : of_ports) {
+                for (Long of_port : of_ports) {
                     ContainerConfig config = new ContainerConfig();
                     config.setContainer(BaseHandler.convertNeutronIDToKey(network.getID()));
                     logger.debug("Adding Port {} to Container : {}", port.toString(), config.getContainer());
                     List<String> ncList = new ArrayList<String>();
                     Node ofNode = new Node(Node.NodeIDType.OPENFLOW, dpidLong);
                     NodeConnector nc = NodeConnector.fromStringNoNode(Node.NodeIDType.OPENFLOW.toString(),
-                                                                      Long.valueOf(of_port.longValue()).intValue()+"",
+                                                                      of_port.intValue()+"",
                                                                       ofNode);
                     ncList.add(nc.toString());
                     config.addNodeConnectors(ncList);

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
index 29b6ea0acf27f943734116a12b1ad3cc09b6c4ca..9006c9f8b1a7612de14ab9f9f60fa4c63e82a3af 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF10Provider.java
@@ -354,7 +354,7 @@ public class OF10Provider implements NetworkProvider {
                 for (Row row : intfs.values()) {
                     Interface patchIntf = ovsdbTable.getTypedRow(node, Interface.class, row);
                     if (patchIntf.getName().equalsIgnoreCase(patchInt)) {
-                        Set<Integer> of_ports = patchIntf.getOpenFlowPortColumn().getData();
+                        Set<Long> of_ports = patchIntf.getOpenFlowPortColumn().getData();
                         if (of_ports == null || of_ports.size() <= 0) {
                             logger.error("Could NOT Identified Patch port {} on {}", patchInt, node);
                             continue;
@@ -370,7 +370,7 @@ public class OF10Provider implements NetworkProvider {
                 for (Row row : intfs.values()) {
                     Interface tunIntf = (Interface)row;
                     if (tunIntf.getName().equals(this.getTunnelName(tunnelType, segmentationId, dst))) {
-                        Set<Integer> of_ports = tunIntf.getOpenFlowPortColumn().getData();
+                        Set<Long> of_ports = tunIntf.getOpenFlowPortColumn().getData();
                         if (of_ports == null || of_ports.size() <= 0) {
                             logger.warn("Could not Identify Tunnel port {} on {}. Don't panic. It might get converged soon...", tunIntf.getName(), node);
                             continue;
@@ -430,7 +430,7 @@ public class OF10Provider implements NetworkProvider {
                 for (Row row : intfs.values()) {
                     Interface patchIntf = ovsdbTable.getTypedRow(node, Interface.class, row);
                     if (patchIntf.getName().equalsIgnoreCase(patchInt)) {
-                        Set<Integer> of_ports = patchIntf.getOpenFlowPortColumn().getData();
+                        Set<Long> of_ports = patchIntf.getOpenFlowPortColumn().getData();
                         if (of_ports == null || of_ports.size() <= 0) {
                             logger.error("Could NOT Identified Patch port {} on {}", patchInt, node);
                             continue;
@@ -446,7 +446,7 @@ public class OF10Provider implements NetworkProvider {
                 for (Row row : intfs.values()) {
                     Interface tunIntf = ovsdbTable.getTypedRow(node, Interface.class, row);
                     if (tunIntf.getName().equals(this.getTunnelName(tunnelType, segmentationId, dst))) {
-                        Set<Integer> of_ports = tunIntf.getOpenFlowPortColumn().getData();
+                        Set<Long> of_ports = tunIntf.getOpenFlowPortColumn().getData();
                         if (of_ports == null || of_ports.size() <= 0) {
                             logger.error("Could NOT Identify Tunnel port {} on {}", tunIntf.getName(), node);
                             continue;
@@ -589,7 +589,7 @@ public class OF10Provider implements NetworkProvider {
                 for (Row row : intfs.values()) {
                     Interface intf = ovsdbTable.getTypedRow(node, Interface.class, row);
                     if (intf.getName().equalsIgnoreCase(portName)) {
-                        Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+                        Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
                         if (of_ports == null || of_ports.size() <= 0) {
                             logger.error("Could not identify patch port {} on {}", portName, node);
                             continue;

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java
index 6a528b8b784b0839fbe6c2a84cc38cc7a0ae5b43..450efd17693bfe2269c9414323311fea659d65ec 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/provider/OF13Provider.java
@@ -813,7 +813,7 @@ public class OF13Provider implements NetworkProvider {
                 return;
             }
 
-            Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+            Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
                 logger.error("Could NOT Identify OF value for port {} on {}", intf.getName(), node);
                 return;
@@ -854,7 +854,7 @@ public class OF13Provider implements NetworkProvider {
                 return;
             }
 
-            Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+            Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
                 logger.error("Could NOT Identify OF value for port {} on {}", intf.getName(), node);
                 return;
@@ -898,7 +898,7 @@ public class OF13Provider implements NetworkProvider {
             }
             OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
 
-            Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+            Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
                 logger.error("Could NOT Identify OF value for port {} on {}", intf.getName(), node);
                 return;
@@ -962,7 +962,7 @@ public class OF13Provider implements NetworkProvider {
             }
             OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
 
-            Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+            Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
                 logger.error("Could NOT Identify OF value for port {} on {}", intf.getName(), node);
                 return;
@@ -1026,7 +1026,7 @@ public class OF13Provider implements NetworkProvider {
             }
             OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
 
-            Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+            Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             int timeout = 6;
             while ((of_ports == null) && (timeout > 0)) {
                 of_ports = intf.getOpenFlowPortColumn().getData();
@@ -1107,7 +1107,7 @@ public class OF13Provider implements NetworkProvider {
             }
             OVSDBConfigService ovsdbTable = (OVSDBConfigService) ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);
 
-            Set<Integer> of_ports = intf.getOpenFlowPortColumn().getData();
+            Set<Long> of_ports = intf.getOpenFlowPortColumn().getData();
             if (of_ports == null || of_ports.size() <= 0) {
                 logger.error("Could NOT Identify OF value for port {} on {}", intf.getName(), node);
                 return;

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
index 7c06c79a5ce91aa71e0923f69cc6a7f9ca50263a..3b8040eabd5b62172882b284f9c27177a82e3463 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java
@@ -11,7 +11,6 @@ package org.opendaylight.ovsdb.plugin;
 
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
 
-import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
@@ -916,7 +915,7 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
 
         Map<String, String> options = null;
         String type = null;
-        Set<BigInteger> tags = null;
+        Set<Long> tags = null;
         if (configs != null) {
             type = (String) configs.get(ConfigConstants.TYPE);
             Map<String, String> customConfigs = (Map<String, String>) configs.get(ConfigConstants.CUSTOM);
@@ -931,8 +930,8 @@ public class ConfigurationService implements IPluginInBridgeDomainConfigService,
         if (type != null) {
             logger.debug("Port type : " + type);
             if (type.equalsIgnoreCase(OvsVswitchdSchemaConstants.PortType.VLAN.name())) {
-                tags = new HashSet<BigInteger>();
-                tags.add(BigInteger.valueOf(Integer.parseInt((String)configs.get(ConfigConstants.VLAN))));
+                tags = new HashSet<Long>();
+                tags.add(Long.parseLong((String)configs.get(ConfigConstants.VLAN)));
             }
         }
 

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java
index 70790ebeb802cded3ff290ab1686dd4bd112c10b..16ef5f5920668ec7c2b72076023d3ac693747898 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Bridge.java
@@ -120,15 +120,15 @@ public interface Bridge extends TypedBaseTable<GenericTableSchema> {
     public void setExternalIds(Map<String, String> externalIds);
 
     @TypedColumn(name="flood_vlans", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getFloodVlansColumn();
+    public Column<GenericTableSchema, Set<Long>> getFloodVlansColumn();
 
     @TypedColumn(name="flood_vlans", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setFloodVlans(Set<Integer> vlans);
+    public void setFloodVlans(Set<Long> vlans);
 
     @TypedColumn(name="flow_tables", method=MethodType.GETCOLUMN, fromVersion="6.5.0")
-    public Column<GenericTableSchema, Map<Integer, UUID>> getFlowTablesColumn();
+    public Column<GenericTableSchema, Map<Long, UUID>> getFlowTablesColumn();
 
     @TypedColumn(name="flow_tables", method=MethodType.SETDATA, fromVersion="6.5.0")
-    public void setFlowTables(Map<Integer, UUID> flowTables);
+    public void setFlowTables(Map<Long, UUID> flowTables);
 
 }

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java
index 96af4d3051cc9563cb56f98e4c495d340fa2e6c9..29feee8989e7b11f7c1f57cf4c9809b360f943f9 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Controller.java
@@ -33,16 +33,16 @@ public interface Controller extends TypedBaseTable<GenericTableSchema> {
     public void setTarget(Set <String> target);
 
     @TypedColumn (name = "controller_burst_limit", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
-    public Column<GenericTableSchema, Integer> getBurstLimitColumn();
+    public Column<GenericTableSchema, Long> getBurstLimitColumn();
 
     @TypedColumn (name = "controller_burst_limit", method = MethodType.SETDATA, fromVersion = "1.0.0")
-    public void setBurstLimit(Integer burstLimit);
+    public void setBurstLimit(Long burstLimit);
 
     @TypedColumn (name = "controller_rate_limit", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
-    public Column<GenericTableSchema, Integer> getRateLimitColumn();
+    public Column<GenericTableSchema, Long> getRateLimitColumn();
 
     @TypedColumn (name = "controller_rate_limit", method = MethodType.SETDATA, fromVersion = "1.0.0")
-    public void setRateLimit(Integer rateLimit);
+    public void setRateLimit(Long rateLimit);
 
     @TypedColumn (name = "connection_mode", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
     public Column<GenericTableSchema, Set<String>> getConnectionModeColumn();
@@ -87,10 +87,10 @@ public interface Controller extends TypedBaseTable<GenericTableSchema> {
     public void setRole(Set<String> role);
 
     @TypedColumn (name = "inactivity_probe", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getInactivityProbeColumn();
+    public Column<GenericTableSchema, Set<Long>> getInactivityProbeColumn();
 
     @TypedColumn (name = "inactivity_probe", method = MethodType.SETDATA, fromVersion = "1.0.0")
-    public void setInactivityProbe(Set<Integer> inactivityProbe);
+    public void setInactivityProbe(Set<Long> inactivityProbe);
 
     @TypedColumn (name = "is_connected", method = MethodType.GETCOLUMN, fromVersion = "1.1.0")
     public Column<GenericTableSchema, Boolean> getIsConnectedColumn();
@@ -105,10 +105,10 @@ public interface Controller extends TypedBaseTable<GenericTableSchema> {
     public void setOtherConfig(Map<String, String> otherConfig);
 
     @TypedColumn (name = "max_backoff", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
-    public Column<GenericTableSchema, Integer> getMaxBackoffColumn();
+    public Column<GenericTableSchema, Long> getMaxBackoffColumn();
 
     @TypedColumn (name = "max_backoff", method = MethodType.SETDATA, fromVersion = "1.0.0")
-    public void setMaxBackoff(Integer maxBackoff);
+    public void setMaxBackoff(Long maxBackoff);
 
     @TypedColumn (name = "local_ip", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
     public Column<GenericTableSchema, Set<String>> getLocalIpColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java
index b0e5c4bd0e6aeead494a312ca0a5db847ca70718..d5f321bd3118c24f43ee27c1c634ae71d02ba709 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSet.java
@@ -27,10 +27,10 @@ import org.opendaylight.ovsdb.lib.schema.typed.TypedTable;
 public interface FlowSampleCollectorSet extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="id", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
-    public Column<GenericTableSchema, Integer> getIdColumn();
+    public Column<GenericTableSchema, Long> getIdColumn();
 
     @TypedColumn(name="id", method=MethodType.SETDATA, fromVersion="7.1.0")
-    public void setId(Integer id);
+    public void setId(Long id);
 
     @TypedColumn(name="bridge", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
     public Column<GenericTableSchema, UUID> getBridgeColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java
index bcff88dd8669f2a99d011df07ae5d72802cc37a1..99195997576c7d467b6b31589c8376197097f964 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTable.java
@@ -27,10 +27,10 @@ import org.opendaylight.ovsdb.lib.schema.typed.TypedTable;
 public interface FlowTable extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="flow_limit", method=MethodType.GETCOLUMN, fromVersion="6.5.0")
-    public Column<GenericTableSchema, Set<Integer>> getFlowLimitColumn() ;
+    public Column<GenericTableSchema, Set<Long>> getFlowLimitColumn() ;
 
     @TypedColumn(name="flow_limit", method=MethodType.SETDATA, fromVersion="6.5.0")
-    public void setFlowLimit(Set<Integer> flowLimit) ;
+    public void setFlowLimit(Set<Long> flowLimit) ;
 
     @TypedColumn(name="overflow_policy", method=MethodType.GETCOLUMN, fromVersion="6.5.0")
     public Column<GenericTableSchema, Set<String>> getOverflowPolicyColumn() ;

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java
index 46215fce986eb97b36ac346db370ba12b808564d..8a2024a7960b4af17b2ef7487f25dc071d25dd9a 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/IPFIX.java
@@ -32,29 +32,29 @@ public interface IPFIX extends TypedBaseTable<GenericTableSchema> {
     public void setTargets(Set<String> targets);
 
     @TypedColumn(name="sampling", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
-    public Column<GenericTableSchema, Set<Integer>> getSamplingColumn();
+    public Column<GenericTableSchema, Set<Long>> getSamplingColumn();
     @TypedColumn(name="sampling", method=MethodType.SETDATA, fromVersion="7.1.0")
-    public void setSampling(Set<Integer> sampling);
+    public void setSampling(Set<Long> sampling);
 
     @TypedColumn(name="obs_domain_id", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
-    public Column<GenericTableSchema, Set<Integer>> getObsDomainIdColumn();
+    public Column<GenericTableSchema, Set<Long>> getObsDomainIdColumn();
     @TypedColumn(name="obs_domain_id", method=MethodType.SETDATA, fromVersion="7.1.0")
-    public void setObsDomainId(Set<Integer> obs_domain_id);
+    public void setObsDomainId(Set<Long> obs_domain_id);
 
     @TypedColumn(name="obs_point_id", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
-    public Column<GenericTableSchema, Set<Integer>> getObsPointIdColumn();
+    public Column<GenericTableSchema, Set<Long>> getObsPointIdColumn();
     @TypedColumn(name="obs_point_id", method=MethodType.SETDATA, fromVersion="7.1.0")
-    public void setObsPointId(Set<Integer> obsPointId);
+    public void setObsPointId(Set<Long> obsPointId);
 
     @TypedColumn(name="cache_active_timeout", method=MethodType.GETCOLUMN, fromVersion="7.3.0")
-    public Column<GenericTableSchema, Set<Integer>> getCacheActiveTimeoutColumn();
+    public Column<GenericTableSchema, Set<Long>> getCacheActiveTimeoutColumn();
     @TypedColumn(name="cache_active_timeout", method=MethodType.SETDATA, fromVersion="7.3.0")
-    public void setCacheActiveTimeout(Set<Integer> cacheActiveTimeout);
+    public void setCacheActiveTimeout(Set<Long> cacheActiveTimeout);
 
     @TypedColumn(name="cache_max_flows", method=MethodType.GETCOLUMN, fromVersion="7.3.0")
-    public Column<GenericTableSchema, Set<Integer>> getCacheMaxFlowsColumn();
+    public Column<GenericTableSchema, Set<Long>> getCacheMaxFlowsColumn();
     @TypedColumn(name="cache_max_flows", method=MethodType.SETDATA, fromVersion="7.3.0")
-    public void setCacheMaxFlows(Set<Integer> cacheMaxFlows);
+    public void setCacheMaxFlows(Set<Long> cacheMaxFlows);
 
     @TypedColumn(name="external_ids", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
     public Column<GenericTableSchema, Map<String, String>> getExternalIdsColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java
index 17d40b20d03a7b6de2e1081dd4d8a6e37312020c..1314189ea3ca2a288e7ce5be54832c53682f212e 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Interface.java
@@ -9,7 +9,6 @@
  */
 package org.opendaylight.ovsdb.schema.openvswitch;
 
-import java.math.BigInteger;
 import java.util.Map;
 import java.util.Set;
 
@@ -44,14 +43,14 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setOptions(Map<String, String> options);
 
     @TypedColumn(name="ingress_policing_rate", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getIngressPolicingRateColumn();
+    public Column<GenericTableSchema, Set<Long>> getIngressPolicingRateColumn();
     @TypedColumn(name="ingress_policing_rate", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setIngressPolicingRate(Set<Integer> ingressPolicingRate);
+    public void setIngressPolicingRate(Set<Long> ingressPolicingRate);
 
     @TypedColumn(name="ingress_policing_burst", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getIngressPolicingBurstColumn();
+    public Column<GenericTableSchema, Set<Long>> getIngressPolicingBurstColumn();
     @TypedColumn(name="ingress_policing_burst", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setIngressPolicingBurst(Set<Integer> ingressPolicingBurst);
+    public void setIngressPolicingBurst(Set<Long> ingressPolicingBurst);
 
     @TypedColumn(name="mac_in_use", method=MethodType.GETCOLUMN, fromVersion="7.1.0")
     public Column<GenericTableSchema,Set<String>> getMacInUseColumn();
@@ -64,9 +63,9 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setMac(Set<String> mac);
 
     @TypedColumn(name="ifindex", method=MethodType.GETCOLUMN, fromVersion="7.2.1")
-    public Column<GenericTableSchema, BigInteger> getIfIndexColumn();
+    public Column<GenericTableSchema, Long> getIfIndexColumn();
     @TypedColumn(name="ifindex", method=MethodType.SETDATA, fromVersion="7.2.1")
-    public void setIfIndex(BigInteger ifIndex);
+    public void setIfIndex(Long ifIndex);
 
     @TypedColumn(name="external_ids", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getExternalIdsColumn();
@@ -74,12 +73,12 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setExternalIds(Map<String, String> externalIds);
 
     @TypedColumn(name="ofport", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getOpenFlowPortColumn();
+    public Column<GenericTableSchema, Set<Long>> getOpenFlowPortColumn();
     @TypedColumn(name="ofport", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setOpenFlowPort(Set<Integer> openFlowPort);
+    public void setOpenFlowPort(Set<Long> openFlowPort);
 
     @TypedColumn(name="ofport_request", method=MethodType.GETCOLUMN, fromVersion="6.2.0")
-    public Column<GenericTableSchema, Set<Integer>> getOpenFlowPortRequestColumn();
+    public Column<GenericTableSchema, Set<Long>> getOpenFlowPortRequestColumn();
     @TypedColumn(name="ofport_request", method=MethodType.SETDATA, fromVersion="6.2.0")
     public void setOpenFlowPortRequest(String openFlowPortRequest);
 
@@ -99,24 +98,24 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setMonitor(String monitor);
 
     @TypedColumn(name="cfm_mpid", method=MethodType.GETCOLUMN, fromVersion="4.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getCfmMpidColumn();
+    public Column<GenericTableSchema, Set<Long>> getCfmMpidColumn();
     @TypedColumn(name="cfm_mpid", method=MethodType.SETDATA)
-    public void setCfmMpid(Set<Integer> cfmMpid);
+    public void setCfmMpid(Set<Long> cfmMpid);
 
     @TypedColumn(name="cfm_remote_mpid", method=MethodType.GETCOLUMN, fromVersion="4.0.0", untilVersion="5.2.0")
-    public Column<GenericTableSchema, Set<Integer>> getCfmRemoteMpidColumn();
+    public Column<GenericTableSchema, Set<Long>> getCfmRemoteMpidColumn();
     @TypedColumn(name="cfm_remote_mpid", method=MethodType.SETDATA, fromVersion="4.0.0", untilVersion="5.2.0")
-    public void setCfmRemoteMpid(Set<Integer> cfmRemoteMpid);
+    public void setCfmRemoteMpid(Set<Long> cfmRemoteMpid);
 
     @TypedColumn(name="cfm_remote_mpids", method=MethodType.GETCOLUMN, fromVersion="6.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getCfmRemoteMpidsColumn();
+    public Column<GenericTableSchema, Set<Long>> getCfmRemoteMpidsColumn();
     @TypedColumn(name="cfm_remote_mpids", method=MethodType.SETDATA, fromVersion="6.0.0")
-    public void setCfmRemoteMpids(Set<Integer> cfmRemoteMpids);
+    public void setCfmRemoteMpids(Set<Long> cfmRemoteMpids);
 
     @TypedColumn(name="cfm_flap_count", method=MethodType.GETCOLUMN, fromVersion="7.3.0")
-    public Column<GenericTableSchema, Set<Integer>> getCfmFlapCountColumn();
+    public Column<GenericTableSchema, Set<Long>> getCfmFlapCountColumn();
     @TypedColumn(name="cfm_flap_count", method=MethodType.SETDATA, fromVersion="7.3.0")
-    public void setCfmFlapCount(Set<Integer> cfmFlapCount);
+    public void setCfmFlapCount(Set<Long> cfmFlapCount);
 
     @TypedColumn(name="cfm_fault", method=MethodType.GETCOLUMN, fromVersion="4.0.0")
     public Column<GenericTableSchema, Set<Boolean>> getCfmFaultColumn();
@@ -134,9 +133,9 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setCfmRemoteOpState(Set<String> cfmRemoteOpState);
 
     @TypedColumn(name="cfm_health", method=MethodType.GETCOLUMN, fromVersion="6.9.0")
-    public Column<GenericTableSchema, Set<Integer>> getCfmHealthColumn();
+    public Column<GenericTableSchema, Set<Long>> getCfmHealthColumn();
     @TypedColumn(name="cfmHealth", method=MethodType.SETDATA, fromVersion="6.9.0")
-    public void setCfmHealth(Set<Integer> cfmHealth);
+    public void setCfmHealth(Set<Long> cfmHealth);
 
     @TypedColumn(name="lacp_current", method=MethodType.GETCOLUMN, fromVersion="3.3.0")
     public Column<GenericTableSchema, Set<Boolean>> getLacpCurrentColumn();
@@ -149,9 +148,9 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setOtherConfig(Map<String, String> otherConfig);
 
     @TypedColumn(name="statistics", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Map<String, Integer>> getStatisticsColumn();
+    public Column<GenericTableSchema, Map<String, Long>> getStatisticsColumn();
     @TypedColumn(name="statistics", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setStatistics(Map<String, Integer> statistics);
+    public void setStatistics(Map<String, Long> statistics);
 
     @TypedColumn(name="status", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getStatusColumn();
@@ -174,19 +173,19 @@ public interface Interface extends TypedBaseTable<GenericTableSchema> {
     public void setLinkResets(Set<String> linkResets);
 
     @TypedColumn(name="link_speed", method=MethodType.GETCOLUMN, fromVersion="1.0.6")
-    public Column<GenericTableSchema, Set<Integer>> getLinkSpeedColumn();
+    public Column<GenericTableSchema, Set<Long>> getLinkSpeedColumn();
     @TypedColumn(name="link_speed", method=MethodType.SETDATA, fromVersion="1.0.6")
-    public void setLinkSpeed(Set<Integer>linkSpeed);
+    public void setLinkSpeed(Set<Long>linkSpeed);
 
     @TypedColumn(name="duplex", method=MethodType.GETCOLUMN, fromVersion="1.0.6")
     public Column<GenericTableSchema, Set<String>> getDuplexColumn();
     @TypedColumn(name="duplex", method=MethodType.SETDATA, fromVersion="1.0.6")
-    public void setDuplex(Set<Integer> duplex);
+    public void setDuplex(Set<Long> duplex);
 
     @TypedColumn(name="mtu", method=MethodType.GETCOLUMN, fromVersion="1.0.6")
-    public Column<GenericTableSchema, Set<Integer>> getMtuColumn();
+    public Column<GenericTableSchema, Set<Long>> getMtuColumn();
     @TypedColumn(name="mtu", method=MethodType.SETDATA, fromVersion="1.0.6")
-    public void setMtu(Set<Integer> mtu);
+    public void setMtu(Set<Long> mtu);
 
     @TypedColumn(name="error", method=MethodType.GETCOLUMN, fromVersion="7.7.0")
     public Column<GenericTableSchema, Set<String>> getErrorColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java
index 3a26a110ccd60430e12784217ab68c50a41ffab8..bb5842c0a45de2760a0bfe5cdb3cd582fe72f85f 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Manager.java
@@ -50,10 +50,10 @@ public interface Manager extends TypedBaseTable<GenericTableSchema> {
     public void setExternalIds(Map<String, String> externalIds);
 
     @TypedColumn (name = "max_backoff", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getMaxBackoffColumn();
+    public Column<GenericTableSchema, Set<Long>> getMaxBackoffColumn();
 
     @TypedColumn (name = "max_backoff", method = MethodType.SETDATA, fromVersion = "1.0.0")
-    public void setMaxBackoff(Set<Integer> maxBackoff);
+    public void setMaxBackoff(Set<Long> maxBackoff);
 
     @TypedColumn (name = "status", method = MethodType.GETCOLUMN, fromVersion = "1.1.0")
     public Column<GenericTableSchema, Map<String, String>> getStatusColumn();
@@ -62,10 +62,10 @@ public interface Manager extends TypedBaseTable<GenericTableSchema> {
     public void setStatus(Map<String, String> status);
 
     @TypedColumn (name = "inactivity_probe", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getInactivityProbeColumn();
+    public Column<GenericTableSchema, Set<Long>> getInactivityProbeColumn();
 
     @TypedColumn (name = "inactivity_probe", method = MethodType.SETDATA, fromVersion = "1.0.0")
-    public void setInactivityProbe(Set<Integer> inactivityProbe);
+    public void setInactivityProbe(Set<Long> inactivityProbe);
 
     @TypedColumn (name = "connection_mode", method = MethodType.GETCOLUMN, fromVersion = "1.0.0")
     public Column<GenericTableSchema, Set<String>> getConnectionModeColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java
index f99515ba325e19f7e1340edc1875bc8ea0f00691..51b22ee614b87c92589f729607ac2686385a3fc9 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Mirror.java
@@ -48,10 +48,10 @@ public interface Mirror extends TypedBaseTable<GenericTableSchema> {
     public void setSelectDstPort(Set<UUID> selectDstPrt);
 
     @TypedColumn(name="select_vlan", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getSelectVlanColumn();
+    public Column<GenericTableSchema, Set<Long>> getSelectVlanColumn();
 
     @TypedColumn(name="select_vlan", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setSelectVlan(Set<Integer> selectVlan);
+    public void setSelectVlan(Set<Long> selectVlan);
 
     @TypedColumn(name="output_port", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Set<UUID>> getOutputPortColumn();
@@ -60,16 +60,16 @@ public interface Mirror extends TypedBaseTable<GenericTableSchema> {
     public void setOutputPort(Set<UUID> outputPort);
 
     @TypedColumn (name="output_vlan", method= MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getOutputVlanColumn();
+    public Column<GenericTableSchema, Set<Long>> getOutputVlanColumn();
 
     @TypedColumn (name="output_vlan", method= MethodType.SETDATA, fromVersion="1.0.0")
-    public void setOutputVlan(Set<Integer> outputVlan);
+    public void setOutputVlan(Set<Long> outputVlan);
 
     @TypedColumn (name="statistics", method= MethodType.GETCOLUMN, fromVersion="6.4.0")
-    public Column<GenericTableSchema, Map<String, Integer>> getStatisticsColumn();
+    public Column<GenericTableSchema, Map<String, Long>> getStatisticsColumn();
 
     @TypedColumn (name="statistics", method= MethodType.SETDATA, fromVersion="6.4.0")
-    public void setStatistics(Map<String, Integer> statistics);
+    public void setStatistics(Map<String, Long> statistics);
 
     @TypedColumn (name="external_ids", method= MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getExternalIdsColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java
index 21a8e05859cb5ac8ea866a451e24a79e5dddc6f5..695e901bbc9a36a796a5af600c79864c44927848 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/NetFlow.java
@@ -9,7 +9,6 @@
  */
 package org.opendaylight.ovsdb.schema.openvswitch;
 
-import java.math.BigInteger;
 import java.util.Map;
 import java.util.Set;
 
@@ -33,16 +32,16 @@ public interface NetFlow extends TypedBaseTable<GenericTableSchema> {
     public void setTargets(Set<String> targets);
 
     @TypedColumn(name="active_timeout", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getActiveTimeoutColumn();
+    public Column<GenericTableSchema, Set<Long>> getActiveTimeoutColumn();
 
     @TypedColumn(name="active_timeout", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setActiveTimeout(Integer activeTimeout);
+    public void setActiveTimeout(Long activeTimeout);
 
     @TypedColumn(name="engine_type", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<BigInteger>> getEngineTypeColumn();
+    public Column<GenericTableSchema, Set<Long>> getEngineTypeColumn();
 
     @TypedColumn(name="engine_type", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setEngineType(Set<BigInteger> engineType);
+    public void setEngineType(Set<Long> engineType);
 
     @TypedColumn(name="external_ids", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getExternalIdsColumn();
@@ -51,10 +50,10 @@ public interface NetFlow extends TypedBaseTable<GenericTableSchema> {
     public void setExternalIds(Map<String, String> externalIds);
 
     @TypedColumn(name="active_timeout", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getActivityTimeoutColumn();
+    public Column<GenericTableSchema, Set<Long>> getActivityTimeoutColumn();
 
     @TypedColumn(name="active_timeout", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setActivityTimeout(Set<Integer> activityTimeout);
+    public void setActivityTimeout(Set<Long> activityTimeout);
 
     @TypedColumn(name="add_id_to_interface", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Set<Boolean>> getAddIdToInterfaceColumn();
@@ -63,9 +62,9 @@ public interface NetFlow extends TypedBaseTable<GenericTableSchema> {
     public void setAddIdToInterface(Boolean addIdToInterface);
 
     @TypedColumn(name="engine_id", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<BigInteger>> getEngineIdColumn();
+    public Column<GenericTableSchema, Set<Long>> getEngineIdColumn();
 
     @TypedColumn(name="engine_id", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setEngineId(Set<BigInteger> engineId);
+    public void setEngineId(Set<Long> engineId);
 
 }

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java
index 8ef2cf10df5a3ea9f12a92151d9ed1d681a635e9..c23e54b71b06af664247742feb20bfee8f8e796d 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/OpenVSwitch.java
@@ -58,14 +58,14 @@ public interface OpenVSwitch extends TypedBaseTable<GenericTableSchema> {
     public void setExternalIds(Map<String, String> externalIds);
 
     @TypedColumn(name="next_cfg", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Integer> getNextConfigColumn();
+    public Column<GenericTableSchema, Long> getNextConfigColumn();
     @TypedColumn(name="next_cfg", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setNextConfig(Integer nextConfig);
+    public void setNextConfig(Long nextConfig);
 
     @TypedColumn(name="cur_cfg", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Integer> getCurrentConfigColumn();
+    public Column<GenericTableSchema, Long> getCurrentConfigColumn();
     @TypedColumn(name="cur_cfg", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setCurrentConfig(Integer currentConfig);
+    public void setCurrentConfig(Long currentConfig);
 
     @TypedColumn(name="capabilities", method=MethodType.GETCOLUMN, fromVersion="1.0.0", untilVersion="6.7.0")
     public Column<GenericTableSchema, Map<String, UUID>> getCapabilitiesColumn();
@@ -73,9 +73,9 @@ public interface OpenVSwitch extends TypedBaseTable<GenericTableSchema> {
     public void setCapabilities(Map<String, UUID> capabilities);
 
     @TypedColumn(name="statistics", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Map<String, Integer>> getStatisticsColumn();
+    public Column<GenericTableSchema, Map<String, Long>> getStatisticsColumn();
     @TypedColumn(name="statistics", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setStatistics(Map<String, Integer> statistics);
+    public void setStatistics(Map<String, Long> statistics);
 
     @TypedColumn(name="ovs_version", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Set<String>> getOvsVersionColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java
index 554747353e2046a508340988251e681461470e25..8340ac2012e3018afc7c72937f5256546945c300 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Port.java
@@ -9,7 +9,6 @@
  */
 package org.opendaylight.ovsdb.schema.openvswitch;
 
-import java.math.BigInteger;
 import java.util.Map;
 import java.util.Set;
 
@@ -40,14 +39,14 @@ public interface Port extends TypedBaseTable<GenericTableSchema> {
     public void setInterfaces(Set<UUID> interfaces);
 
     @TypedColumn(name="trunks", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<BigInteger>> getTrunksColumn();
+    public Column<GenericTableSchema, Set<Long>> getTrunksColumn();
     @TypedColumn(name="trunks", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setTrunks(Set<BigInteger> trunks);
+    public void setTrunks(Set<Long> trunks);
 
     @TypedColumn(name="tag", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<BigInteger>> getTagColumn();
+    public Column<GenericTableSchema, Set<Long>> getTagColumn();
     @TypedColumn(name="tag", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setTag(Set<BigInteger> tag);
+    public void setTag(Set<Long> tag);
 
     @TypedColumn(name="vlan_mode", method=MethodType.GETCOLUMN, fromVersion="6.1.0")
     public Column<GenericTableSchema, Set<String>> getVlanModeColumn();
@@ -80,14 +79,14 @@ public interface Port extends TypedBaseTable<GenericTableSchema> {
     public void setLacp(Set<String> lacp);
 
     @TypedColumn(name="bond_updelay", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<BigInteger>> getBondUpDelayColumn();
+    public Column<GenericTableSchema, Set<Long>> getBondUpDelayColumn();
     @TypedColumn(name="bond_updelay", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setBondUpDelay(Set<BigInteger> bondUpDelay);
+    public void setBondUpDelay(Set<Long> bondUpDelay);
 
     @TypedColumn(name="bond_downdelay", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<BigInteger>> getBondDownDelayColumn();
+    public Column<GenericTableSchema, Set<Long>> getBondDownDelayColumn();
     @TypedColumn(name="bond_downdelay", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setBondDownDelay(Set<BigInteger> bondDownDelay);
+    public void setBondDownDelay(Set<Long> bondDownDelay);
 
     @TypedColumn(name="bond_fake_iface", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Set<Boolean>> getBondFakeInterfaceColumn();
@@ -105,9 +104,9 @@ public interface Port extends TypedBaseTable<GenericTableSchema> {
     public void setStatus(Map<String, String> status);
 
     @TypedColumn(name="statistics", method=MethodType.GETCOLUMN, fromVersion="6.3.0")
-    public Column<GenericTableSchema, Map<String, BigInteger>> getStatisticsColumn();
+    public Column<GenericTableSchema, Map<String, Long>> getStatisticsColumn();
     @TypedColumn(name="statistics", method=MethodType.SETDATA)
-    public void setStatistics(Map<String, BigInteger> statistics);
+    public void setStatistics(Map<String, Long> statistics);
 
     @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java
index 1012281c5e559f050697c4343d2d87b06fa39872..b853ede8a9b808ff1257f82df9b5ad50eafc37a3 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Qos.java
@@ -28,10 +28,10 @@ import java.util.Set;
 public interface Qos extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn (name="queues", method= MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Map<Integer, UUID>> getQueuesColumn() ;
+    public Column<GenericTableSchema, Map<Long, UUID>> getQueuesColumn() ;
 
     @TypedColumn (name="queues", method= MethodType.SETDATA, fromVersion="1.0.0")
-    public void setQueues(Map<Integer, UUID> queues) ;
+    public void setQueues(Map<Long, UUID> queues) ;
 
     @TypedColumn (name="type", method= MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Set<String>> getTypeColumn() ;

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java
index 14518ba6dcb838cbb4100f6374e7121bd21d46e4..4f174a947d81bf1d4fa9d20e214ab683bf9122f5 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/Queue.java
@@ -27,10 +27,10 @@ import java.util.Set;
 public interface Queue extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn (name="dscp", method= MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getDscpColumn() ;
+    public Column<GenericTableSchema, Set<Long>> getDscpColumn() ;
 
     @TypedColumn (name="dscp", method= MethodType.SETDATA, fromVersion="6.4.0")
-    public void setDscp(Set<Integer> dscp) ;
+    public void setDscp(Set<Long> dscp) ;
 
     @TypedColumn (name="other_config", method= MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn() ;

diff --git a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java
index ddf9c941aebeef5b2909b62227c1801c86014698..73495bc9e6b3c87cb6a104daa414dd054a126ddb 100644 (file)
--- a/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java
+++ b/schemas/Open_vSwitch/src/main/java/org/opendaylight/ovsdb/schema/openvswitch/SFlow.java
@@ -40,17 +40,17 @@ public interface SFlow extends TypedBaseTable<GenericTableSchema> {
     public void setExternalIds(Map<String, String> externalIds) ;
 
     @TypedColumn(name="header", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getHeaderColumn() ;
+    public Column<GenericTableSchema, Set<Long>> getHeaderColumn() ;
     @TypedColumn(name="header", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setHeader(Set<Integer> header) ;
+    public void setHeader(Set<Long> header) ;
 
     @TypedColumn(name="polling", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getPollingColumn() ;
+    public Column<GenericTableSchema, Set<Long>> getPollingColumn() ;
     @TypedColumn(name="polling", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setPolling(Set<Integer> polling) ;
+    public void setPolling(Set<Long> polling) ;
 
     @TypedColumn(name="sampling", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getSamplingColumn() ;
+    public Column<GenericTableSchema, Set<Long>> getSamplingColumn() ;
     @TypedColumn(name="sampling", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setSampling(Set<Integer> sampling) ;
+    public void setSampling(Set<Long> sampling) ;
 }
\ No newline at end of file

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
index 1f6cc3cda003d35ce2c70e0c00e6b9d3a1641838..24d857a6d1fdec1a62ff079fda7911f6920d7d84 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/BridgeTestCases.java
@@ -51,7 +51,7 @@ public class BridgeTestCases extends OpenVswitchSchemaTestBase {
         Assert.assertNotNull(bridge);
         bridge.setName(TEST_BRIDGE_NAME);
         bridge.setStatus(ImmutableMap.of("key", "value"));
-        bridge.setFloodVlans(Sets.newHashSet(34));
+        bridge.setFloodVlans(Sets.newHashSet(34L));
 
         OpenVSwitch openVSwitch = this.ovs.createTypedRowWrapper(OpenVSwitch.class);
         openVSwitch.setBridges(Sets.newHashSet(new UUID(TEST_BRIDGE_NAME)));

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
index a4af837361236b3ed09f49c751852e6b05b3083c..95bbdc5534a63c0b6953212805f226d02689423f 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowSampleCollectorSetTestCases.java
@@ -61,7 +61,7 @@ public class FlowSampleCollectorSetTestCases extends OpenVswitchSchemaTestBase {
         // Don't run this test if the table is not supported
         Assume.assumeTrue(schemaVersion.compareTo(flowSampleCollectorSetFromVersion) >= 0);
         FlowSampleCollectorSet flowSampleCollectorSet = ovs.createTypedRowWrapper(FlowSampleCollectorSet.class);
-        flowSampleCollectorSet.setId(1);
+        flowSampleCollectorSet.setId(Long.valueOf(1));
         flowSampleCollectorSet.setExternalIds(ImmutableMap.of("<3", "ovs"));
         flowSampleCollectorSet.setBridge(OpenVswitchSchemaSuiteIT.getTestBridgeUuid());
         Bridge bridge = ovs.getTypedRowWrapper(Bridge.class, null);

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
index 2ffe9b8231732f6af841640344068d8f0377886b..a0dbb9296f6757f6c738a648e240ed86e15e7386 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/FlowTableTestCases.java
@@ -73,9 +73,9 @@ public class FlowTableTestCases extends OpenVswitchSchemaTestBase {
         String overflowPolicy = "evict";
         String groups = "group name";
         String prefixes = "wildcarding prefixes";
-        Integer flowLimit = 50000;
-        Map<Integer, UUID> flowTableBrRef = new HashMap<>();
-        flowTableBrRef.put(1, new UUID(flowTableUuidStr));
+        Long flowLimit = 50000L;
+        Map<Long, UUID> flowTableBrRef = new HashMap<>();
+        flowTableBrRef.put(1L, new UUID(flowTableUuidStr));
         FlowTable flowTable = ovs.createTypedRowWrapper(FlowTable.class);
         flowTable.setName(ImmutableSet.of(tableName));
         flowTable.setOverflowPolicy(ImmutableSet.of(overflowPolicy));

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
index 2df638582c508b8a4068e50c647e2e9a321f9440..944f36c58a77380ee214d5e7b050e79372c2924b 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/IpfixTestCases.java
@@ -67,11 +67,11 @@ public class IpfixTestCases extends OpenVswitchSchemaTestBase {
         Assume.assumeTrue(schemaVersion.compareTo(ipfixFromVersion) >= 0);
         String ipfixUuidStr = "testIpfix";
         String ipfixTarget = "172.16.20.1:4739";
-        Integer obsDomainId = 112;
-        Integer obsPointId = 358;
-        Integer cacheMax = 132;
-        Integer cacheTimeout = 134;
-        Integer sampling = 558;
+        Long obsDomainId = 112L;
+        Long obsPointId = 358L;
+        Long cacheMax = 132L;
+        Long cacheTimeout = 134L;
+        Long sampling = 558L;
 
         IPFIX ipfix = ovs.createTypedRowWrapper(IPFIX.class);
         ipfix.setTargets(ImmutableSet.of(ipfixTarget));

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
index f755fafd1d1bafe6ee457cbe3a22dbf17007ee3f..0d73f59c20ac82a2255d899695596d00e077582c 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/ManagerTestCases.java
@@ -51,8 +51,8 @@ public class ManagerTestCases extends OpenVswitchSchemaTestBase {
         OpenVSwitch openVSwitch = ovs.getTypedRowWrapper(OpenVSwitch.class, null);
 
         Manager manager = ovs.createTypedRowWrapper(Manager.class);
-        manager.setInactivityProbe(Sets.newHashSet(8192));
-        manager.setMaxBackoff(Sets.newHashSet(4094));
+        manager.setInactivityProbe(Sets.newHashSet(8192L));
+        manager.setMaxBackoff(Sets.newHashSet(4094L));
         manager.setTarget(Sets.newHashSet("172.16.50.50:6640"));
         manager.setExternalIds(externalIds);
 

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
index c2c2fad081543d8f5dd3ac13d302104db8ad5926..86b71d05b74eb8a85d08111e100e00c50c364d2f 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/MirrorTestCases.java
@@ -46,8 +46,8 @@ public class MirrorTestCases extends OpenVswitchSchemaTestBase {
 
         String mirrorUuidStr = "testMirror";
         String mirrorName = "my_name_is_mirror";
-        Integer outputVid = 1024;
-        Integer selectVid = 2048;
+        Long outputVid = 1024L;
+        Long selectVid = Long.valueOf(2048);
 
         Mirror mirror = ovs.createTypedRowWrapper(Mirror.class);
         mirror.setName(ImmutableSet.of(mirrorName));

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
index 65c08b3e559993a9cc4cdabdece3fb40879530f4..b4bcad1e57d0e453a7939fb91de16134ea26918b 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/NetflowTestCases.java
@@ -26,7 +26,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -46,9 +45,9 @@ public class NetflowTestCases extends OpenVswitchSchemaTestBase {
     public void testCreateTypedNetFlow() throws InterruptedException, ExecutionException, IllegalArgumentException{
         String netFlowUuidStr = "testNetFlow";
         String netFlowTargets = "172.16.20.200:6343";
-        BigInteger engineType = BigInteger.valueOf(128);
-        BigInteger engineID = BigInteger.valueOf(32);
-        Integer activityTimeout = 1;
+        Long engineType = 128L;
+        Long engineID = 32L;
+        Long activityTimeout = 1L;
         NetFlow netFlow = ovs.createTypedRowWrapper(NetFlow.class);
         netFlow.setTargets(ImmutableSet.of(netFlowTargets));
         netFlow.setEngineType(ImmutableSet.of(engineType));

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
index b1fb9dd3969d68a7b91302a5a64b5b6e7e473a27..7484156a1aebadf3bfe9b8d8425213c31324f938 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/PortAndInterfaceTestCases.java
@@ -26,7 +26,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.math.BigInteger;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
@@ -49,7 +48,7 @@ public class PortAndInterfaceTestCases extends OpenVswitchSchemaTestBase {
         String intfUuidStr = "testIntf";
         Port port = ovs.createTypedRowWrapper(Port.class);
         port.setName("testPort");
-        port.setTag(ImmutableSet.of(BigInteger.ONE));
+        port.setTag(ImmutableSet.of(1L));
         port.setMac(ImmutableSet.of("00:00:00:00:00:01"));
         port.setInterfaces(ImmutableSet.of(new UUID(intfUuidStr)));
 

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
index ee15d63e3ac3c4a75c6d9a661f38534f86aeb298..8a92a8dd61e6c2cd0f3a0a2289b80330f5c65f89 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/QueueTestCases.java
@@ -48,10 +48,10 @@ public class QueueTestCases extends OpenVswitchSchemaTestBase {
          * since it wouldn't add any conceivable value.
          */
         String queueUuidStr = "queueUuidStr";
-        Integer dscpVal = 4;
+        Long dscpVal = Long.valueOf(4);
         Queue queue = ovs.createTypedRowWrapper(Queue.class);
         // Example of explicit ImmutableSet/Map Attribute declaration
-        ImmutableSet<Integer> dscp = ImmutableSet.of(dscpVal);
+        ImmutableSet<Long> dscp = ImmutableSet.of(dscpVal);
         ImmutableMap<String, String> externalIds = ImmutableMap.of("little", "coat");
         // Example of condensing the attributes bindings in one line
         queue.setOtherConfig(ImmutableMap.of("war", "onfun"));
@@ -61,7 +61,7 @@ public class QueueTestCases extends OpenVswitchSchemaTestBase {
         // Get the parent Qos table row UUID to insert the queue.
         Qos qos = ovs.getTypedRowWrapper(Qos.class, null);
         // Queue key that is mapped to the queue record/value/ofp_action_enqueue
-        Integer queueKey = Integer.valueOf(0);
+        Long queueKey = 0L;
         // The transaction index for the Queue insert is used to store the Queue UUID
         int insertQueueOperationIndex = 0;
         // Reference the Port row to insert the Queue with UID or Port name

diff --git a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
index 229adb3852401daa25a4a4e1133f83015a838563..1341bb555a5ef35483cdceebbdfe1986e52474e9 100644 (file)
--- a/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
+++ b/schemas/Open_vSwitch/src/test/java/org/opendaylight/ovsdb/schema/openvswitch/SflowTestCases.java
@@ -46,11 +46,11 @@ public class SflowTestCases extends OpenVswitchSchemaTestBase {
     public void testCreateTypedSflow() throws InterruptedException, ExecutionException, IllegalArgumentException{
         String sFlowUuidStr = "testSFlow";
         String sFlowTarget = "172.16.20.200:6343";
-        Integer header = 128;
-        Integer obsPointId = 358;
-        Integer polling = 10;
+        Long header = 128L;
+        Long obsPointId = 358L;
+        Long polling =10L;
         String agent = "172.16.20.210";
-        Integer sampling = 64;
+        Long sampling = 64L;
         SFlow sFlow = ovs.createTypedRowWrapper(SFlow.class);
         sFlow.setTargets(ImmutableSet.of(sFlowTarget));
         sFlow.setHeader(ImmutableSet.of(header));

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java
index 32c2ecedfadd444055c5f7edb3333ae215317930..dbad60908610051aa2fdb6775970847836b4d956 100644 (file)
--- a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java
+++ b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalBindingStats.java
@@ -20,26 +20,26 @@ import org.opendaylight.ovsdb.lib.schema.typed.TypedTable;
 public interface LogicalBindingStats extends TypedBaseTable<GenericTableSchema> {
 
     @TypedColumn(name="bytes_from_local", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Integer> getBytesFromLocalColumn();
+    public Column<GenericTableSchema, Long> getBytesFromLocalColumn();
 
     @TypedColumn(name="bytes_from_local", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setBytesFromLocal(Integer bytesFromLocal);
+    public void setBytesFromLocal(Long bytesFromLocal);
 
     @TypedColumn(name="packets_from_local", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Integer> getPacketsFromLocalColumn();
+    public Column<GenericTableSchema, Long> getPacketsFromLocalColumn();
 
     @TypedColumn(name="packets_from_local", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setPacketsFromLocal(Integer packetsFromLocal);
+    public void setPacketsFromLocal(Long packetsFromLocal);
 
     @TypedColumn(name="bytes_to_local", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Integer> getBytesToLocalColumn();
+    public Column<GenericTableSchema, Long> getBytesToLocalColumn();
 
     @TypedColumn(name="bytes_to_local", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setBytesToLocal(Integer bytesToLocal);
+    public void setBytesToLocal(Long bytesToLocal);
 
     @TypedColumn(name="packets_to_local", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Integer> getPacketsToLocalColumn();
+    public Column<GenericTableSchema, Long> getPacketsToLocalColumn();
 
     @TypedColumn(name="packets_to_local", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setPacketsToLocal(Integer packetsToLocal);
+    public void setPacketsToLocal(Long packetsToLocal);
 }

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
index e1257e25dd2f98a1411ee99eb34d17eaeb26b2b2..c99309cb0cb37a00bfc824865a89034be7e58f1b 100644 (file)
--- a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
+++ b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/LogicalSwitch.java
@@ -41,8 +41,8 @@ public interface LogicalSwitch extends TypedBaseTable<GenericTableSchema> {
 
 
     @TypedColumn(name="tunnel_key", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getTunnelKeyColumn();
+    public Column<GenericTableSchema, Set<Long>> getTunnelKeyColumn();
 
     @TypedColumn(name="tunnel_key", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setTunnelKey(Set<Integer> tunnelKey);
+    public void setTunnelKey(Set<Long> tunnelKey);
 }
\ No newline at end of file

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java
index 5d39bf2ab672472be7b1d80f8693373a0b50a501..839d06c17265d8161a7ccbfdde84d35eadbbeb36 100644 (file)
--- a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java
+++ b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/Manager.java
@@ -30,16 +30,16 @@ public interface Manager extends TypedBaseTable<GenericTableSchema> {
     public void setTarget(String target);
 
     @TypedColumn(name="max_backoff", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getMaxBackoffColumn();
+    public Column<GenericTableSchema, Set<Long>> getMaxBackoffColumn();
 
     @TypedColumn(name="max_backoff", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setMaxBackoff(Set<Integer> maxBackoff);
+    public void setMaxBackoff(Set<Long> maxBackoff);
 
     @TypedColumn(name="inactivity_probe", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Set<Integer>> getInactivityProbeColumn();
+    public Column<GenericTableSchema, Set<Long>> getInactivityProbeColumn();
 
     @TypedColumn(name="inactivity_probe", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setInactivityProbe(Set<Integer> inactivityProbe);
+    public void setInactivityProbe(Set<Long> inactivityProbe);
 
     @TypedColumn(name="other_config", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
     public Column<GenericTableSchema, Map<String, String>> getOtherConfigColumn();

diff --git a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
index 6e4a06fb2de7a65661a77c7b0ceba2671bca9d6f..be1f6069d0fa3b7ca712dce44a125145985ce112 100644 (file)
--- a/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
+++ b/schemas/hardware_vtep/src/main/java/org/opendaylight/ovsdb/schema/hardwarevtep/PhysicalPort.java
@@ -43,17 +43,17 @@ public interface PhysicalPort extends TypedBaseTable<GenericTableSchema> {
 
 
     @TypedColumn(name="vlan_bindings", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Map<Integer, UUID>> getVlanBindingsColumn();
+    public Column<GenericTableSchema, Map<Long, UUID>> getVlanBindingsColumn();
 
     @TypedColumn(name="vlan_bindings", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setVlanBindings(Map<Integer, UUID> vlanBindings);
+    public void setVlanBindings(Map<Long, UUID> vlanBindings);
 
 
     @TypedColumn(name="vlan_stats", method=MethodType.GETCOLUMN, fromVersion="1.0.0")
-    public Column<GenericTableSchema, Map<Integer, UUID>> getVlanStatsColumn();
+    public Column<GenericTableSchema, Map<Long, UUID>> getVlanStatsColumn();
 
     @TypedColumn(name="vlan_stats", method=MethodType.SETDATA, fromVersion="1.0.0")
-    public void setVlanStats(Map<Integer, UUID> vlanStats);
+    public void setVlanStats(Map<Long, UUID> vlanStats);
 
 
     @TypedColumn(name="port_fault_status", method=MethodType.GETCOLUMN, fromVersion="1.1.0")