X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-openflowd.c;h=858770d0370c21d941e3d2f51b5060893a567d65;hb=6a1f89c86b67db7ad1532031a726bd4f517ab162;hp=70a74da85558d315a7995303b4c7d4705713548d;hpb=0e17074a1a43edadde14266715c614a8313c6cbb;p=openvswitch diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c index 70a74da8..858770d0 100644 --- a/utilities/ovs-openflowd.c +++ b/utilities/ovs-openflowd.c @@ -71,6 +71,7 @@ struct ofsettings { const char *hw_desc; /* Hardware. */ const char *sw_desc; /* Software version. */ const char *serial_desc; /* Serial number. */ + const char *dp_desc; /* Datapath description. */ /* Related vconns and network devices. */ const char *controller_name; /* Controller (if not discovery mode). */ @@ -94,9 +95,6 @@ struct ofsettings { /* Spanning tree protocol. */ bool enable_stp; - /* Management. */ - uint64_t mgmt_id; /* Management ID. */ - /* NetFlow. */ struct svec netflow; /* NetFlow targets. */ }; @@ -174,10 +172,8 @@ main(int argc, char *argv[]) if (s.datapath_id) { ofproto_set_datapath_id(ofproto, s.datapath_id); } - if (s.mgmt_id) { - ofproto_set_mgmt_id(ofproto, s.mgmt_id); - } - ofproto_set_desc(ofproto, s.mfr_desc, s.hw_desc, s.sw_desc, s.serial_desc); + ofproto_set_desc(ofproto, s.mfr_desc, s.hw_desc, s.sw_desc, + s.serial_desc, s.dp_desc); if (!s.listeners.n) { svec_add_nocopy(&s.listeners, xasprintf("punix:%s/%s.mgmt", ovs_rundir, s.dp_name)); @@ -244,10 +240,11 @@ parse_options(int argc, char *argv[], struct ofsettings *s) { enum { OPT_DATAPATH_ID = UCHAR_MAX + 1, - OPT_MANUFACTURER, - OPT_HARDWARE, - OPT_SOFTWARE, - OPT_SERIAL, + OPT_MFR_DESC, + OPT_HW_DESC, + OPT_SW_DESC, + OPT_SERIAL_DESC, + OPT_DP_DESC, OPT_ACCEPT_VCONN, OPT_NO_RESOLV_CONF, OPT_BR_NAME, @@ -271,10 +268,11 @@ parse_options(int argc, char *argv[], struct ofsettings *s) }; static struct option long_options[] = { {"datapath-id", required_argument, 0, OPT_DATAPATH_ID}, - {"manufacturer", required_argument, 0, OPT_MANUFACTURER}, - {"hardware", required_argument, 0, OPT_HARDWARE}, - {"software", required_argument, 0, OPT_SOFTWARE}, - {"serial", required_argument, 0, OPT_SERIAL}, + {"mfr-desc", required_argument, 0, OPT_MFR_DESC}, + {"hw-desc", required_argument, 0, OPT_HW_DESC}, + {"sw-desc", required_argument, 0, OPT_SW_DESC}, + {"serial-desc", required_argument, 0, OPT_SERIAL_DESC}, + {"dp-desc", required_argument, 0, OPT_DP_DESC}, {"accept-vconn", required_argument, 0, OPT_ACCEPT_VCONN}, {"no-resolv-conf", no_argument, 0, OPT_NO_RESOLV_CONF}, {"config", required_argument, 0, 'F'}, @@ -292,7 +290,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) {"out-of-band", no_argument, 0, OPT_OUT_OF_BAND}, {"in-band", no_argument, 0, OPT_IN_BAND}, {"netflow", required_argument, 0, OPT_NETFLOW}, - {"mgmt-id", required_argument, 0, OPT_MGMT_ID}, {"ports", required_argument, 0, OPT_PORTS}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, @@ -314,6 +311,7 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->hw_desc = NULL; s->sw_desc = NULL; s->serial_desc = NULL; + s->dp_desc = NULL; svec_init(&s->listeners); svec_init(&s->snoops); s->fail_mode = FAIL_OPEN; @@ -327,7 +325,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) s->enable_stp = false; s->in_band = true; svec_init(&s->netflow); - s->mgmt_id = 0; svec_init(&s->ports); for (;;) { int c; @@ -341,26 +338,30 @@ parse_options(int argc, char *argv[], struct ofsettings *s) case OPT_DATAPATH_ID: if (!dpid_from_string(optarg, &s->datapath_id)) { ovs_fatal(0, "argument to --datapath-id must be " - "exactly 12 hex digits and may not be all-zero"); + "exactly 16 hex digits and may not be all-zero"); } break; - case OPT_MANUFACTURER: + case OPT_MFR_DESC: s->mfr_desc = optarg; break; - case OPT_HARDWARE: + case OPT_HW_DESC: s->hw_desc = optarg; break; - case OPT_SOFTWARE: + case OPT_SW_DESC: s->sw_desc = optarg; break; - case OPT_SERIAL: + case OPT_SERIAL_DESC: s->serial_desc = optarg; break; + case OPT_DP_DESC: + s->dp_desc = optarg; + break; + case OPT_ACCEPT_VCONN: s->accept_controller_re = optarg; break; @@ -445,18 +446,6 @@ parse_options(int argc, char *argv[], struct ofsettings *s) svec_add(&s->netflow, optarg); break; - case OPT_MGMT_ID: - if (strlen(optarg) != 12 - || strspn(optarg, "0123456789abcdefABCDEF") != 12) { - ovs_fatal(0, "argument to --mgmt-id must be " - "exactly 12 hex digits"); - } - s->mgmt_id = strtoll(optarg, NULL, 16); - if (!s->mgmt_id) { - ovs_fatal(0, "argument to --mgmt-id must be nonzero"); - } - break; - case 'l': svec_add(&s->listeners, optarg); break; @@ -541,13 +530,12 @@ usage(void) vconn_usage(true, true, true); printf("\nOpenFlow options:\n" " -d, --datapath-id=ID Use ID as the OpenFlow switch ID\n" - " (ID must consist of 12 hex digits)\n" - " --mgmt-id=ID Use ID as the management ID\n" - " (ID must consist of 12 hex digits)\n" - " --manufacturer=MFR Identify manufacturer as MFR\n" - " --hardware=HW Identify hardware as HW\n" - " --software=SW Identify software as SW\n" - " --serial=SERIAL Identify serial number as SERIAL\n" + " (ID must consist of 16 hex digits)\n" + " --mfr-desc=MFR Identify manufacturer as MFR\n" + " --hw-desc=HW Identify hardware as HW\n" + " --sw-desc=SW Identify software as SW\n" + " --serial-desc=SERIAL Identify serial number as SERIAL\n" + " --dp-desc=DP_DESC Identify dp description as DP_DESC\n" "\nController discovery options:\n" " --accept-vconn=REGEX accept matching discovered controllers\n" " --no-resolv-conf do not update /etc/resolv.conf\n"