X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fofproto.h;h=b3a55a435419d3ec96dea087b6ce43474bd569ab;hb=4d5f814dfb737aae820b8ce70ff0a8b94c291ec3;hp=32a00f232b1ff9b6a646555bd1d1f8fe52da2a58;hpb=e368cad8ecf6dbf272b2a3775b2e3e5e2dc6a5cf;p=sliver-openvswitch.git diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 32a00f232..b3a55a435 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,7 +33,6 @@ extern "C" { #endif -struct cfm_settings; struct cls_rule; struct netdev; struct ofproto; @@ -44,7 +43,7 @@ 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]; @@ -132,18 +131,26 @@ 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 *); int ofproto_enumerate_names(const char *type, struct sset *names); void ofproto_parse_name(const char *name, char **dp_name, char **dp_type); +/* An interface hint element, which is used by ofproto_init() to + * describe the caller's understanding of the startup state. */ +struct iface_hint { + char *br_name; /* Name of owning bridge. */ + char *br_type; /* Type of owning bridge. */ + uint16_t ofp_port; /* OpenFlow port number. */ +}; + +void ofproto_init(const struct shash *iface_hints); + +int ofproto_type_run(const char *datapath_type); +int ofproto_type_run_fast(const char *datapath_type); +void ofproto_type_wait(const char *datapath_type); + int ofproto_create(const char *datapath, const char *datapath_type, struct ofproto **ofprotop); void ofproto_destroy(struct ofproto *); @@ -190,9 +197,11 @@ int ofproto_port_dump_done(struct ofproto_port_dump *); : (ofproto_port_dump_done(DUMP), false)); \ ) -#define OFPROTO_FLOW_EVICTON_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, + const char *port_type); int ofproto_port_add(struct ofproto *, struct netdev *, uint16_t *ofp_portp); int ofproto_port_del(struct ofproto *, uint16_t ofp_port); int ofproto_port_get_stats(const struct ofport *, struct netdev_stats *stats); @@ -204,7 +213,8 @@ int ofproto_port_query_by_name(const struct ofproto *, const char *devname, uint64_t ofproto_get_datapath_id(const struct ofproto *); void ofproto_set_datapath_id(struct ofproto *, uint64_t datapath_id); void ofproto_set_controllers(struct ofproto *, - const struct ofproto_controller *, size_t n); + const struct ofproto_controller *, size_t n, + uint32_t allowed_versions); void ofproto_set_fail_mode(struct ofproto *, enum ofproto_fail_mode fail_mode); void ofproto_reconnect_controllers(struct ofproto *); void ofproto_set_extra_in_band_remotes(struct ofproto *, @@ -212,11 +222,9 @@ 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); @@ -273,7 +281,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. */ @@ -348,15 +355,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.) *