This patch regenerates OVSDB schema with vswitchd/vswitch.ovsschema v7.14.0 included in OVS v2.6.0 release.
Signed-off-by: IWASE Yusuke <[email protected]> --- ryu/lib/ovs/vsctl.py | 7 ++++--- ryu/lib/ovs/vswitch_idl.py | 52 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 53 insertions(+), 6 deletions(-) diff --git a/ryu/lib/ovs/vsctl.py b/ryu/lib/ovs/vsctl.py index 39e114e..000f1d0 100644 --- a/ryu/lib/ovs/vsctl.py +++ b/ryu/lib/ovs/vsctl.py @@ -1884,7 +1884,7 @@ def schema_print(schema_location, prefix): schema = ovs.db.schema.DbSchema.from_json(json) print('# Do NOT edit.') - print('# This is automatically generated.') + print('# This is automatically generated by %s' % __file__) print('# created based on version %s' % (schema.version or 'unknown')) print('') print('') @@ -1903,10 +1903,11 @@ def schema_print(schema_location, prefix): def main(): if len(sys.argv) <= 2: - print('Usage: %s <schema file> <prefix>' % sys.argv[0]) + print('Usage: %s <schema file>' % sys.argv[0]) + print('e.g.: %s vswitchd/vswitch.ovsschema' % sys.argv[0]) location = sys.argv[1] - prefix = sys.argv[2] + prefix = 'OVSREC' schema_print(location, prefix) diff --git a/ryu/lib/ovs/vswitch_idl.py b/ryu/lib/ovs/vswitch_idl.py index 192c889..523d551 100644 --- a/ryu/lib/ovs/vswitch_idl.py +++ b/ryu/lib/ovs/vswitch_idl.py @@ -14,25 +14,38 @@ # See the License for the specific language governing permissions and # limitations under the License. -# created based on -# "version": "6.10.0" -# "cksum": "3699312094 16958" +# Do NOT edit. +# This is automatically generated by ryu/lib/ovs/vsctl.py +# created based on version 7.14.0 + OVSREC_DB_NAME = 'Open_vSwitch' +OVSREC_TABLE_AUTOATTACH = 'AutoAttach' +OVSREC_AUTOATTACH_COL_MAPPINGS = 'mappings' +OVSREC_AUTOATTACH_COL_SYSTEM_DESCRIPTION = 'system_description' +OVSREC_AUTOATTACH_COL_SYSTEM_NAME = 'system_name' + OVSREC_TABLE_BRIDGE = 'Bridge' +OVSREC_BRIDGE_COL_AUTO_ATTACH = 'auto_attach' OVSREC_BRIDGE_COL_CONTROLLER = 'controller' OVSREC_BRIDGE_COL_DATAPATH_ID = 'datapath_id' OVSREC_BRIDGE_COL_DATAPATH_TYPE = 'datapath_type' +OVSREC_BRIDGE_COL_DATAPATH_VERSION = 'datapath_version' OVSREC_BRIDGE_COL_EXTERNAL_IDS = 'external_ids' OVSREC_BRIDGE_COL_FAIL_MODE = 'fail_mode' OVSREC_BRIDGE_COL_FLOOD_VLANS = 'flood_vlans' OVSREC_BRIDGE_COL_FLOW_TABLES = 'flow_tables' +OVSREC_BRIDGE_COL_IPFIX = 'ipfix' +OVSREC_BRIDGE_COL_MCAST_SNOOPING_ENABLE = 'mcast_snooping_enable' OVSREC_BRIDGE_COL_MIRRORS = 'mirrors' OVSREC_BRIDGE_COL_NAME = 'name' OVSREC_BRIDGE_COL_NETFLOW = 'netflow' OVSREC_BRIDGE_COL_OTHER_CONFIG = 'other_config' OVSREC_BRIDGE_COL_PORTS = 'ports' +OVSREC_BRIDGE_COL_PROTOCOLS = 'protocols' +OVSREC_BRIDGE_COL_RSTP_ENABLE = 'rstp_enable' +OVSREC_BRIDGE_COL_RSTP_STATUS = 'rstp_status' OVSREC_BRIDGE_COL_SFLOW = 'sflow' OVSREC_BRIDGE_COL_STATUS = 'status' OVSREC_BRIDGE_COL_STP_ENABLE = 'stp_enable' @@ -54,32 +67,59 @@ OVSREC_CONTROLLER_COL_ROLE = 'role' OVSREC_CONTROLLER_COL_STATUS = 'status' OVSREC_CONTROLLER_COL_TARGET = 'target' +OVSREC_TABLE_FLOW_SAMPLE_COLLECTOR_SET = 'Flow_Sample_Collector_Set' +OVSREC_FLOW_SAMPLE_COLLECTOR_SET_COL_BRIDGE = 'bridge' +OVSREC_FLOW_SAMPLE_COLLECTOR_SET_COL_EXTERNAL_IDS = 'external_ids' +OVSREC_FLOW_SAMPLE_COLLECTOR_SET_COL_ID = 'id' +OVSREC_FLOW_SAMPLE_COLLECTOR_SET_COL_IPFIX = 'ipfix' + OVSREC_TABLE_FLOW_TABLE = 'Flow_Table' +OVSREC_FLOW_TABLE_COL_EXTERNAL_IDS = 'external_ids' OVSREC_FLOW_TABLE_COL_FLOW_LIMIT = 'flow_limit' OVSREC_FLOW_TABLE_COL_GROUPS = 'groups' OVSREC_FLOW_TABLE_COL_NAME = 'name' OVSREC_FLOW_TABLE_COL_OVERFLOW_POLICY = 'overflow_policy' +OVSREC_FLOW_TABLE_COL_PREFIXES = 'prefixes' + +OVSREC_TABLE_IPFIX = 'IPFIX' +OVSREC_IPFIX_COL_CACHE_ACTIVE_TIMEOUT = 'cache_active_timeout' +OVSREC_IPFIX_COL_CACHE_MAX_FLOWS = 'cache_max_flows' +OVSREC_IPFIX_COL_EXTERNAL_IDS = 'external_ids' +OVSREC_IPFIX_COL_OBS_DOMAIN_ID = 'obs_domain_id' +OVSREC_IPFIX_COL_OBS_POINT_ID = 'obs_point_id' +OVSREC_IPFIX_COL_OTHER_CONFIG = 'other_config' +OVSREC_IPFIX_COL_SAMPLING = 'sampling' +OVSREC_IPFIX_COL_TARGETS = 'targets' OVSREC_TABLE_INTERFACE = 'Interface' OVSREC_INTERFACE_COL_ADMIN_STATE = 'admin_state' +OVSREC_INTERFACE_COL_BFD = 'bfd' +OVSREC_INTERFACE_COL_BFD_STATUS = 'bfd_status' OVSREC_INTERFACE_COL_CFM_FAULT = 'cfm_fault' OVSREC_INTERFACE_COL_CFM_FAULT_STATUS = 'cfm_fault_status' +OVSREC_INTERFACE_COL_CFM_FLAP_COUNT = 'cfm_flap_count' OVSREC_INTERFACE_COL_CFM_HEALTH = 'cfm_health' OVSREC_INTERFACE_COL_CFM_MPID = 'cfm_mpid' OVSREC_INTERFACE_COL_CFM_REMOTE_MPIDS = 'cfm_remote_mpids' OVSREC_INTERFACE_COL_CFM_REMOTE_OPSTATE = 'cfm_remote_opstate' OVSREC_INTERFACE_COL_DUPLEX = 'duplex' +OVSREC_INTERFACE_COL_ERROR = 'error' OVSREC_INTERFACE_COL_EXTERNAL_IDS = 'external_ids' +OVSREC_INTERFACE_COL_IFINDEX = 'ifindex' OVSREC_INTERFACE_COL_INGRESS_POLICING_BURST = 'ingress_policing_burst' OVSREC_INTERFACE_COL_INGRESS_POLICING_RATE = 'ingress_policing_rate' OVSREC_INTERFACE_COL_LACP_CURRENT = 'lacp_current' OVSREC_INTERFACE_COL_LINK_RESETS = 'link_resets' OVSREC_INTERFACE_COL_LINK_SPEED = 'link_speed' OVSREC_INTERFACE_COL_LINK_STATE = 'link_state' +OVSREC_INTERFACE_COL_LLDP = 'lldp' OVSREC_INTERFACE_COL_MAC = 'mac' +OVSREC_INTERFACE_COL_MAC_IN_USE = 'mac_in_use' OVSREC_INTERFACE_COL_MTU = 'mtu' +OVSREC_INTERFACE_COL_MTU_REQUEST = 'mtu_request' OVSREC_INTERFACE_COL_NAME = 'name' OVSREC_INTERFACE_COL_OFPORT = 'ofport' +OVSREC_INTERFACE_COL_OFPORT_REQUEST = 'ofport_request' OVSREC_INTERFACE_COL_OPTIONS = 'options' OVSREC_INTERFACE_COL_OTHER_CONFIG = 'other_config' OVSREC_INTERFACE_COL_STATISTICS = 'statistics' @@ -105,6 +145,7 @@ OVSREC_MIRROR_COL_SELECT_ALL = 'select_all' OVSREC_MIRROR_COL_SELECT_DST_PORT = 'select_dst_port' OVSREC_MIRROR_COL_SELECT_SRC_PORT = 'select_src_port' OVSREC_MIRROR_COL_SELECT_VLAN = 'select_vlan' +OVSREC_MIRROR_COL_SNAPLEN = 'snaplen' OVSREC_MIRROR_COL_STATISTICS = 'statistics' OVSREC_TABLE_NETFLOW = 'NetFlow' @@ -118,8 +159,10 @@ OVSREC_NETFLOW_COL_TARGETS = 'targets' OVSREC_TABLE_OPEN_VSWITCH = 'Open_vSwitch' OVSREC_OPEN_VSWITCH_COL_BRIDGES = 'bridges' OVSREC_OPEN_VSWITCH_COL_CUR_CFG = 'cur_cfg' +OVSREC_OPEN_VSWITCH_COL_DATAPATH_TYPES = 'datapath_types' OVSREC_OPEN_VSWITCH_COL_DB_VERSION = 'db_version' OVSREC_OPEN_VSWITCH_COL_EXTERNAL_IDS = 'external_ids' +OVSREC_OPEN_VSWITCH_COL_IFACE_TYPES = 'iface_types' OVSREC_OPEN_VSWITCH_COL_MANAGER_OPTIONS = 'manager_options' OVSREC_OPEN_VSWITCH_COL_NEXT_CFG = 'next_cfg' OVSREC_OPEN_VSWITCH_COL_OTHER_CONFIG = 'other_config' @@ -130,6 +173,7 @@ OVSREC_OPEN_VSWITCH_COL_SYSTEM_TYPE = 'system_type' OVSREC_OPEN_VSWITCH_COL_SYSTEM_VERSION = 'system_version' OVSREC_TABLE_PORT = 'Port' +OVSREC_PORT_COL_BOND_ACTIVE_SLAVE = 'bond_active_slave' OVSREC_PORT_COL_BOND_DOWNDELAY = 'bond_downdelay' OVSREC_PORT_COL_BOND_FAKE_IFACE = 'bond_fake_iface' OVSREC_PORT_COL_BOND_MODE = 'bond_mode' @@ -142,6 +186,8 @@ OVSREC_PORT_COL_MAC = 'mac' OVSREC_PORT_COL_NAME = 'name' OVSREC_PORT_COL_OTHER_CONFIG = 'other_config' OVSREC_PORT_COL_QOS = 'qos' +OVSREC_PORT_COL_RSTP_STATISTICS = 'rstp_statistics' +OVSREC_PORT_COL_RSTP_STATUS = 'rstp_status' OVSREC_PORT_COL_STATISTICS = 'statistics' OVSREC_PORT_COL_STATUS = 'status' OVSREC_PORT_COL_TAG = 'tag' -- 2.7.4 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, SlashDot.org! http://sdm.link/slashdot _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
