X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=acb1790c4c68de41ca1e60418cc39891e55d5f69;hb=8d71683b7632b5b621dd21418bf33ff90865b4e0;hp=e4abe523d4873f5389dbdf31a4ef0e23d042c88a;hpb=0aeaabc8dbccef7593dc19e891a3f5bbef1991cd;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index e4abe523d..acb1790c4 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,6 +33,7 @@ extern "C" { #endif +struct bfd_cfg; struct cfm_settings; struct cls_rule; struct netdev; @@ -40,11 +41,12 @@ struct ofproto; struct ofport; struct shash; struct simap; +struct smap; struct netdev_stats; struct ofproto_controller_info { bool is_connected; - enum nx_role role; + enum ofp12_controller_role role; struct { const char *keys[4]; const char *values[4]; @@ -69,6 +71,19 @@ struct ofproto_sflow_options { char *control_ip; }; + +struct ofproto_ipfix_bridge_exporter_options { + struct sset targets; + uint32_t sampling_rate; + uint32_t obs_domain_id; /* Bridge-wide Observation Domain ID. */ + uint32_t obs_point_id; /* Bridge-wide Observation Point ID. */ +}; + +struct ofproto_ipfix_flow_exporter_options { + uint32_t collector_set_id; + struct sset targets; +}; + struct ofproto_stp_settings { stp_identifier system_id; uint16_t priority; @@ -132,12 +147,6 @@ struct ofproto_controller { uint8_t dscp; /* DSCP value for controller connection. */ }; -#define DEFAULT_MFR_DESC "Nicira, Inc." -#define DEFAULT_HW_DESC "Open vSwitch" -#define DEFAULT_SW_DESC VERSION -#define DEFAULT_SERIAL_DESC "None" -#define DEFAULT_DP_DESC "None" - void ofproto_enumerate_types(struct sset *types); const char *ofproto_normalize_type(const char *); @@ -204,7 +213,7 @@ int ofproto_port_dump_done(struct ofproto_port_dump *); : (ofproto_port_dump_done(DUMP), false)); \ ) -#define OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT 1000 +#define OFPROTO_FLOW_EVICTION_THRESHOLD_DEFAULT 2500 #define OFPROTO_FLOW_EVICTION_THRESHOLD_MIN 100 const char *ofproto_port_open_type(const char *datapath_type, @@ -229,15 +238,17 @@ void ofproto_set_extra_in_band_remotes(struct ofproto *, void ofproto_set_in_band_queue(struct ofproto *, int queue_id); void ofproto_set_flow_eviction_threshold(struct ofproto *, unsigned threshold); void ofproto_set_forward_bpdu(struct ofproto *, bool forward_bpdu); -void ofproto_set_mac_idle_time(struct ofproto *, unsigned idle_time); -void ofproto_set_desc(struct ofproto *, - const char *mfr_desc, const char *hw_desc, - const char *sw_desc, const char *serial_desc, - const char *dp_desc); +void ofproto_set_mac_table_config(struct ofproto *, unsigned idle_time, + size_t max_entries); +void ofproto_set_dp_desc(struct ofproto *, const char *dp_desc); int ofproto_set_snoops(struct ofproto *, const struct sset *snoops); int ofproto_set_netflow(struct ofproto *, const struct netflow_options *nf_options); int ofproto_set_sflow(struct ofproto *, const struct ofproto_sflow_options *); +int ofproto_set_ipfix(struct ofproto *, + const struct ofproto_ipfix_bridge_exporter_options *, + const struct ofproto_ipfix_flow_exporter_options *, + size_t); int ofproto_set_stp(struct ofproto *, const struct ofproto_stp_settings *); int ofproto_get_stp_status(struct ofproto *, struct ofproto_stp_status *); @@ -247,6 +258,10 @@ void ofproto_port_unregister(struct ofproto *, uint16_t ofp_port); void ofproto_port_clear_cfm(struct ofproto *, uint16_t ofp_port); void ofproto_port_set_cfm(struct ofproto *, uint16_t ofp_port, const struct cfm_settings *); +void ofproto_port_set_bfd(struct ofproto *, uint16_t ofp_port, + const struct smap *cfg); +int ofproto_port_get_bfd_status(struct ofproto *, uint16_t ofp_port, + struct smap *); int ofproto_port_is_lacp_current(struct ofproto *, uint16_t ofp_port); int ofproto_port_set_stp(struct ofproto *, uint16_t ofp_port, const struct ofproto_port_stp_settings *); @@ -290,7 +305,6 @@ struct ofproto_bundle_settings { bool use_priority_tags; /* Use 802.1p tag for frames in VLAN 0? */ struct bond_settings *bond; /* Must be nonnull iff if n_slaves > 1. */ - uint32_t *bond_stable_ids; /* Array of n_slaves elements. */ struct lacp_settings *lacp; /* Nonnull to enable LACP. */ struct lacp_slave_settings *lacp_slaves; /* Array of n_slaves elements. */ @@ -365,15 +379,33 @@ void ofproto_get_snoops(const struct ofproto *, struct sset *); void ofproto_get_all_flows(struct ofproto *p, struct ds *); void ofproto_get_netflow_ids(const struct ofproto *, uint8_t *engine_type, uint8_t *engine_id); -int ofproto_port_get_cfm_fault(const struct ofproto *, uint16_t ofp_port); -int ofproto_port_get_cfm_opup(const struct ofproto *, uint16_t ofp_port); -int ofproto_port_get_cfm_remote_mpids(const struct ofproto *, - uint16_t ofp_port, const uint64_t **rmps, - size_t *n_rmps); -int ofproto_port_get_cfm_health(const struct ofproto *ofproto, - uint16_t ofp_port); + void ofproto_get_ofproto_controller_info(const struct ofproto *, struct shash *); void ofproto_free_ofproto_controller_info(struct shash *); + +/* CFM status query. */ +struct ofproto_cfm_status { + /* 0 if not faulted, otherwise a combination of one or more reasons. */ + enum cfm_fault_reason faults; + + /* 0 if the remote CFM endpoint is operationally down, + * 1 if the remote CFM endpoint is operationally up, + * -1 if we don't know because the remote CFM endpoint is not in extended + * mode. */ + int remote_opstate; + + /* Ordinarily a "health status" in the range 0...100 inclusive, with 0 + * being worst and 100 being best, or -1 if the health status is not + * well-defined. */ + int health; + + /* MPIDs of remote maintenance points whose CCMs have been received. */ + const uint64_t *rmps; + size_t n_rmps; +}; + +bool ofproto_port_get_cfm_status(const struct ofproto *, uint16_t ofp_port, + struct ofproto_cfm_status *); /* Linux VLAN device support (e.g. "eth0.10" for VLAN 10.) *