I'm fine with opup too. I'm sticking with opstate in the database, and changed
it in the code. Here is an incremental. Third time's a charm.
Ethan
---
lib/cfm.c | 30 +++++++++++++++---------------
lib/cfm.h | 4 ++--
ofproto/ofproto-dpif.c | 2 +-
vswitchd/bridge.c | 2 +-
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/lib/cfm.c b/lib/cfm.c
index d615819..0d79bee 100644
--- a/lib/cfm.c
+++ b/lib/cfm.c
@@ -87,8 +87,8 @@ struct cfm {
bool extended; /* Extended mode. */
bool fault; /* Indicates connectivity fault. */
bool unexpected_recv; /* Received an unexpected CCM. */
- bool opstate; /* Operational State. */
- bool remote_opstate; /* Remote opterational state. */
+ bool opup; /* Operational State. */
+ bool remote_opup; /* Remote Operational State. */
uint32_t seq; /* The sequence number of our last CCM. */
uint8_t ccm_interval; /* The CCM transmission interval. */
@@ -115,7 +115,7 @@ struct remote_mp {
bool recv; /* CCM was received since last fault check. */
bool rdi; /* Remote Defect Indicator. Indicates remote_mp isn't
receiving CCMs that it's expecting to. */
- bool opstate; /* Operational state. */
+ bool opup; /* Operational State. */
};
static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20);
@@ -248,7 +248,7 @@ cfm_create(const char *name)
hmap_init(&cfm->remote_mps);
cfm_generate_maid(cfm);
hmap_insert(&all_cfms, &cfm->hmap_node, hash_string(cfm->name, 0));
- cfm->remote_opstate = true;
+ cfm->remote_opup = true;
return cfm;
}
@@ -289,7 +289,7 @@ cfm_run(struct cfm *cfm)
cfm->rmps_array = xmalloc(hmap_count(&cfm->remote_mps) *
sizeof *cfm->rmps_array);
- cfm->remote_opstate = true;
+ cfm->remote_opup = true;
HMAP_FOR_EACH_SAFE (rmp, rmp_next, node, &cfm->remote_mps) {
if (!rmp->recv) {
@@ -312,8 +312,8 @@ cfm_run(struct cfm *cfm)
cfm->fault = true;
}
- if (!rmp->opstate) {
- cfm->remote_opstate = rmp->opstate;
+ if (!rmp->opup) {
+ cfm->remote_opup = rmp->opup;
}
cfm->rmps_array[cfm->rmps_array_len++] = rmp->mpid;
@@ -359,7 +359,7 @@ cfm_compose_ccm(struct cfm *cfm, struct ofpbuf *packet,
if (cfm->extended) {
ccm->mpid = htons(hash_mpid(cfm->mpid));
ccm->mpid64 = htonll(cfm->mpid);
- ccm->opdown = !cfm->opstate;
+ ccm->opdown = !cfm->opup;
} else {
ccm->mpid = htons(cfm->mpid);
ccm->mpid64 = htonll(0);
@@ -396,7 +396,7 @@ cfm_configure(struct cfm *cfm, const struct cfm_settings *s)
cfm->mpid = s->mpid;
cfm->extended = s->extended;
- cfm->opstate = s->opstate;
+ cfm->opup = s->opup;
interval = ms_to_ccm_interval(s->interval);
interval_ms = ccm_interval_to_ms(interval);
@@ -509,7 +509,7 @@ cfm_process_heartbeat(struct cfm *cfm, const struct ofpbuf
*p)
rmp->mpid = ccm_mpid;
rmp->recv = true;
rmp->rdi = ccm_rdi;
- rmp->opstate = !ccm_opdown;
+ rmp->opup = !ccm_opdown;
}
VLOG_DBG("%s: received CCM (seq %"PRIu32") (mpid %"PRIu64")"
@@ -531,9 +531,9 @@ cfm_get_fault(const struct cfm *cfm)
* remote maintenance points. Returns true if 'cfm' is operationally up. False
* otherwise. */
bool
-cfm_get_opstate(const struct cfm *cfm)
+cfm_get_opup(const struct cfm *cfm)
{
- return cfm->remote_opstate;
+ return cfm->remote_opup;
}
/* Populates 'rmps' with an array of remote maintenance points reachable by
@@ -571,9 +571,9 @@ cfm_print_details(struct ds *ds, const struct cfm *cfm)
cfm->fault ? " fault" : "",
cfm->unexpected_recv ? " unexpected_recv" : "");
- ds_put_format(ds, "\topstate: %s\n", cfm->opstate ? "up" : "down");
+ ds_put_format(ds, "\topstate: %s\n", cfm->opup ? "up" : "down");
ds_put_format(ds, "\tremote_opstate: %s\n",
- cfm->remote_opstate ? "up" : "down");
+ cfm->remote_opup ? "up" : "down");
ds_put_format(ds, "\tinterval: %dms\n", cfm->ccm_interval_ms);
ds_put_format(ds, "\tnext CCM tx: %lldms\n",
timer_msecs_until_expired(&cfm->tx_timer));
@@ -586,7 +586,7 @@ cfm_print_details(struct ds *ds, const struct cfm *cfm)
rmp->rdi ? " rdi" : "");
ds_put_format(ds, "\trecv since check: %s\n",
rmp->recv ? "true" : "false");
- ds_put_format(ds, "\topstate: %s\n", rmp->opstate ? "up" : "down");
+ ds_put_format(ds, "\topstate: %s\n", rmp->opup? "up" : "down");
}
}
diff --git a/lib/cfm.h b/lib/cfm.h
index 7e43ded..1c46ffa 100644
--- a/lib/cfm.h
+++ b/lib/cfm.h
@@ -28,7 +28,7 @@ struct cfm_settings {
uint64_t mpid; /* The MPID of this CFM. */
int interval; /* The requested transmission interval. */
bool extended; /* Run in extended mode. */
- bool opstate; /* Operational State. */
+ bool opup; /* Operational State. */
};
void cfm_init(void);
@@ -42,7 +42,7 @@ bool cfm_configure(struct cfm *, const struct cfm_settings *);
bool cfm_should_process_flow(const struct cfm *cfm, const struct flow *);
void cfm_process_heartbeat(struct cfm *, const struct ofpbuf *packet);
bool cfm_get_fault(const struct cfm *);
-bool cfm_get_opstate(const struct cfm *);
+bool cfm_get_opup(const struct cfm *);
void cfm_get_remote_mpids(const struct cfm *, const uint64_t **rmps,
size_t *n_rmps);
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index 237b071..1ffe36a 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1569,7 +1569,7 @@ port_run(struct ofport_dpif *ofport)
}
enable = enable && !cfm_get_fault(ofport->cfm)
- && cfm_get_opstate(ofport->cfm);
+ && cfm_get_opup(ofport->cfm);
}
if (ofport->bundle) {
diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index b0dc550..186f250 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -2688,7 +2688,7 @@ iface_configure_cfm(struct iface *iface)
s.extended = !strcasecmp("true", extended_str);
opstate_str = get_interface_other_config(iface->cfg, "cfm_opstate", "up");
- s.opstate = !strcasecmp("up", opstate_str);
+ s.opup = !strcasecmp("up", opstate_str);
ofproto_port_set_cfm(iface->port->bridge->ofproto, iface->ofp_port, &s);
}
--
1.7.6.1
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
