[ovs-dev] [PATCH 2/2] ovs-xapi-sync: Style cleanup.
Reid Price
reid at nicira.com
Sat Sep 24 00:27:54 UTC 2011
Looks obviously correct, though you might want to fix
"Map from interface name to <???>"
while you're there
On Fri, Sep 23, 2011 at 5:21 PM, Ethan Jackson <ethan at nicira.com> wrote:
> Pleases pep8.
> ---
> .../usr_share_openvswitch_scripts_ovs-xapi-sync | 30
> ++++++++++++++++----
> 1 files changed, 24 insertions(+), 6 deletions(-)
>
> diff --git a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
> b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
> index b2d9358..7b61e25 100755
> --- a/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
> +++ b/xenserver/usr_share_openvswitch_scripts_ovs-xapi-sync
> @@ -23,7 +23,8 @@
> # - Set the fail-mode on internal bridges.
>
> import getopt
> -import logging, logging.handlers
> +import logging
> +import logging.handlers
> import os
> import signal
> import subprocess
> @@ -40,10 +41,11 @@ import ovs.daemon
> import ovs.db.idl
>
> s_log = logging.getLogger("ovs-xapi-sync")
> -vsctl="/usr/bin/ovs-vsctl"
> +vsctl = "/usr/bin/ovs-vsctl"
> session = None
> force_run = False
>
> +
> # Set up a session to interact with XAPI.
> #
> # On system start-up, OVS comes up before XAPI, so we can't log into the
> @@ -64,6 +66,7 @@ def init_session():
>
> return True
>
> +
> def get_network_by_bridge(br_name):
> if not init_session():
> s_log.warning("Failed to get bridge id %s because"
> @@ -77,6 +80,7 @@ def get_network_by_bridge(br_name):
>
> return None
>
> +
> # By default, the "bridge-id" external id in the Bridge table is the
> # same as "xs-network-uuids". This may be overridden by defining a
> # "nicira-bridge-id" key in the "other_config" field of the network
> @@ -88,6 +92,7 @@ def get_bridge_id(br_name, default=None):
> return rec['other_config'].get('nicira-bridge-id', default)
> return None
>
> +
> # By default, the "iface-id" external id in the Interface table is the
> # same as "xs-vif-uuid". This may be overridden by defining a
> # "nicira-iface-id" key in the "other_config" field of the VIF
> @@ -111,12 +116,14 @@ def get_iface_id(if_name, xs_vif_uuid):
> s_log.warning("Could not find XAPI entry for VIF %s" % if_name)
> return xs_vif_uuid
>
> +
> def call_vsctl(args):
> cmd = [vsctl, "--timeout=30", "-vANY:console:off"] + args
> exitcode = subprocess.call(cmd)
> if exitcode != 0:
> s_log.warning("Couldn't call ovs-vsctl")
>
> +
> def set_or_delete(d, key, value):
> if value is None:
> if key in d:
> @@ -128,11 +135,13 @@ def set_or_delete(d, key, value):
> return True
> return False
>
> +
> def set_external_id(row, key, value):
> external_ids = row.external_ids
> if set_or_delete(external_ids, key, value):
> row.external_ids = external_ids
>
> +
> # XenServer does not call interface-reconfigure on internal networks,
> # which is where the fail-mode would normally be set.
> def update_fail_mode(row):
> @@ -146,7 +155,8 @@ def update_fail_mode(row):
> pools = session.xenapi.pool.get_all()
> if len(pools) == 1:
> prec = session.xenapi.pool.get_record(pools[0])
> - fail_mode =
> prec['other_config'].get('vswitch-controller-fail-mode')
> + fail_mode = prec['other_config'].get(
> + 'vswitch-controller-fail-mode')
>
> if fail_mode not in ['standalone', 'secure']:
> fail_mode = 'standalone'
> @@ -154,6 +164,7 @@ def update_fail_mode(row):
> if row.fail_mode != fail_mode:
> row.fail_mode = fail_mode
>
> +
> def update_in_band_mgmt(row):
> rec = get_network_by_bridge(row.name)
> if not rec:
> @@ -168,6 +179,7 @@ def update_in_band_mgmt(row):
> elif set_or_delete(other_config, 'disable-in-band', dib):
> row.other_config = other_config
>
> +
> def update_bridge_id(row):
> id_ = get_bridge_id(row.name,
> row.external_ids.get("xs-network-uuids"))
> if not id_:
> @@ -175,6 +187,7 @@ def update_bridge_id(row):
>
> set_external_id(row, "bridge-id", id_.split(";")[0])
>
> +
> def keep_table_columns(schema, table_name, columns):
> table = schema.tables.get(table_name)
> if not table:
> @@ -190,6 +203,7 @@ def keep_table_columns(schema, table_name, columns):
> table.columns = new_columns
> return table
>
> +
> def prune_schema(schema):
> new_tables = {}
> new_tables["Bridge"] = keep_table_columns(
> @@ -199,6 +213,7 @@ def prune_schema(schema):
> schema, "Interface", ("name", "external_ids"))
> schema.tables = new_tables
>
> +
> def usage():
> print "usage: %s [OPTIONS] DATABASE" % sys.argv[0]
> print "where DATABASE is a socket on which ovsdb-server is listening."
> @@ -207,11 +222,13 @@ def usage():
> print " -h, --help display this help message"
> sys.exit(0)
>
> +
> def handler(signum, _):
> global force_run
> if (signum == signal.SIGHUP):
> force_run = True
>
> +
> def main(argv):
> global force_run
>
> @@ -258,7 +275,7 @@ def main(argv):
> signal.signal(signal.SIGHUP, handler)
>
> bridges = {} # Map from bridge name to xs_network_uuids
> - interfaces = {} # Map from interface name to
> + interfaces = {} # Map from interface name to
> while True:
> if not force_run and not idl.run():
> poller = ovs.poller.Poller()
> @@ -268,9 +285,9 @@ def main(argv):
>
> if force_run:
> s_log.info("Forced to re-run as the result of a SIGHUP")
> - bridges = {}
> + bridges = {}
> interfaces = {}
> - force_run = False
> + force_run = False
>
> txn = ovs.db.idl.Transaction(idl)
>
> @@ -344,6 +361,7 @@ def main(argv):
>
> txn.commit_block()
>
> +
> if __name__ == '__main__':
> try:
> main(sys.argv)
> --
> 1.7.6.1
>
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> http://openvswitch.org/mailman/listinfo/dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.openvswitch.org/pipermail/ovs-dev/attachments/20110923/271c3daf/attachment-0003.html>
More information about the dev
mailing list