openstack/dragonflow
Code Issues Proposed changes

Remove double spaces in strings.

Browse Source 
Change-Id: I6affc9046cd71e09676d2a1de12b6d5acaad7d14
This commit is contained in:
yuli 2016-06-08 15:07:24 +03:00
parent 4b14c28d13
commit 3d722880ee
10 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/etcd_driver
View File

@ -37,7 +37,7 @@ function configure_etcd_systemd_service {
iniset $ETCD_CONF DEFAULT ETCD_ADVERTISE_CLIENT_URLS "http://$REMOTE_DB_IP:4001"
iniset $ETCD_CONF DEFAULT ETCD_NAME "$HOSTNAME"
sudo cp $DEST/dragonflow/devstack/etcd.service /lib/systemd/system/
sudo cp $DEST/dragonflow/devstack/etcd.service /lib/systemd/system/
sudo systemctl enable etcd
}

10
devstack/ovs_setup.sh
View File

@ -27,7 +27,7 @@ function _neutron_ovs_install_ovs_deps_fedora {
function _neutron_ovs_get_rpm_basename {
PACKAGE=$1
SPEC=${2:-rhel/openvswitch-fedora.spec}
BASENAME=`rpmspec -q $SPEC --provides | awk "/^$PACKAGE\s*=/ {print \\\$1\"-\"\\\$3}" | head -1`
BASENAME=`rpmspec -q $SPEC --provides | awk "/^$PACKAGE\s*=/ {print \\\$1\"-\"\\\$3}" | head -1`
echo `rpmspec -q $SPEC | grep "^$BASENAME"`
}
@ -73,9 +73,9 @@ tar -xzf openvswitch-${VERSION}.tar.gz -C \$HOME/rpmbuild/SOURCES
pushd \$HOME/rpmbuild/SOURCES/openvswitch-${VERSION}
_neutron_ovs_install_ovs_deps_fedora $DNF
rpmbuild -bb --without check rhel/openvswitch-fedora.spec
rpmbuild -bb -D "kversion `uname -r`" rhel/openvswitch-kmod-fedora.spec
rpmbuild -bb -D "kversion `uname -r`" rhel/openvswitch-kmod-fedora.spec
OVS_RPM_BASENAME=\$(_neutron_ovs_get_rpm_file openvswitch)
rpmrebuild --change-spec-requires="awk '\\\$1 == \\\"Requires:\\\" && \\\$2 == \\\"/bin/python\\\" {\\\$2 = \\\"/usr/bin/python\\\"} {print \\\$0}'" -p \$OVS_RPM_BASENAME
rpmrebuild --change-spec-requires="awk '\\\$1 == \\\"Requires:\\\" && \\\$2 == \\\"/bin/python\\\" {\\\$2 = \\\"/usr/bin/python\\\"} {print \\\$0}'" -p \$OVS_RPM_BASENAME
OVS_PY_RPM_BASENAME=""
OVS_KMOD_RPM_BASENAME=\$(_neutron_ovs_get_rpm_file openvswitch-kmod rhel/openvswitch-kmod-fedora.spec)
$DNF install -y \$OVS_RPM_BASENAME \$OVS_PY_RPM_BASENAME \$OVS_KMOD_RPM_BASENAME
@ -180,7 +180,7 @@ function start_ovs {
function cleanup_ovs {
# Remove the patch ports
for port in $(sudo ovs-vsctl show | grep Port | awk '{print $2}' | cut -d '"' -f 2 | grep patch); do
for port in $(sudo ovs-vsctl show | grep Port | awk '{print $2}' | cut -d '"' -f 2 | grep patch); do
sudo ovs-vsctl del-port ${port}
done
@ -190,7 +190,7 @@ function cleanup_ovs {
done
# Remove all the vxlan ports
for port in $(sudo ovs-vsctl list port | grep name | grep vxlan | awk '{print $3}' | cut -d '"' -f 2); do
for port in $(sudo ovs-vsctl list port | grep name | grep vxlan | awk '{print $3}' | cut -d '"' -f 2); do
sudo ovs-vsctl del-port ${port}
done

4
devstack/plugin.sh
View File

@ -195,7 +195,7 @@ function init_ovs {
base_dir=$DATA_DIR/ovs
mkdir -p $base_dir
for db in conf.db ; do
for db in conf.db ; do
if [ -f $base_dir/$db ] ; then
rm -f $base_dir/$db
fi
@ -240,7 +240,7 @@ function ovs_service_status
TEMP_PID=$OVS_DIR"/"$1".pid"
if [ -e $TEMP_PID ]
then
TEMP_PID_VALUE=$(cat $TEMP_PID 2>/dev/null)
TEMP_PID_VALUE=$(cat $TEMP_PID 2>/dev/null)
if [ -e /proc/$TEMP_PID_VALUE ]
then
return 0

2
devstack/zmq_pubsub_driver
View File

@ -12,5 +12,5 @@ function configure_pubsub_service_plugin {
ZMQ_IPC_SOCKET_DIR=`dirname $ZMQ_IPC_SOCKET`
sudo mkdir -p $ZMQ_IPC_SOCKET_DIR
sudo chown $STACK_USER $ZMQ_IPC_SOCKET_DIR
sudo chown $STACK_USER $ZMQ_IPC_SOCKET_DIR
}

6
doc/source/specs/igmp_application_and_multicast_support.rst
View File

@ -41,7 +41,7 @@ particular multicast group.
Forwarding of the multicast packets will be done in the overlay network. By
recording in the distributed database to what multicast group a VM is
registered, we know which Compute Nodes need to receive a copy of each packet.
registered, we know which Compute Nodes need to receive a copy of each packet.
Routing multicast packets to the physical network will be handled in another
blueprint.
@ -91,7 +91,7 @@ Extend the Dragonflow pipeline with flows that implement the following:
reduce unnecessary copies.
* Only 1 MCP is forwarded to a compute node that hosts one or more relevant
registered ports. The IGMP Agent application on the compute node will
registered ports. The IGMP Agent application on the compute node will
forward the MCP locally to all the relevant ports.
* If the TTL on the MCP is greater than 1, and there are relevant registered
@ -301,7 +301,7 @@ We propose the following new configuration:
*Subnet*
*enable-igmp* : Boolean - Will IGMP, and by extension, multicast, be
*enable-igmp* : Boolean - Will IGMP, and by extension, multicast, be
supported on this subnet. If true, this spec is applied. If false, all
router ports connected to this subnet are not multicast routers. IGMP
packets are treated as regular routed IP packets. MCPs are not routed to

2
doc/source/specs/template.rst
View File

@ -44,7 +44,7 @@ Proposed Change
How do you propose to solve this problem?
This section is optional, and provides an area to discuss your high-level
design at the same time as use cases, if desired. Note that by high-level,
design at the same time as use cases, if desired. Note that by high-level,
we mean the "view from orbit" rough cut at how things will happen.
This section should 'scope' the effort from a feature standpoint: how is the

2
dragonflow/cli/df_db.py
View File

@ -28,7 +28,7 @@ db_tables = ['lport', 'lswitch', 'lrouter', 'chassis', 'secgroup',
'tunnel_key', 'floatingip', 'publisher']
usage_str = "The following commands are supported:\n" \
"1) df-db ls - print all the db tables \n" \
"1) df-db ls - print all the db tables \n" \
"2) df-db ls <table_name> - print all the keys for specific table \n" \
"3) df-db get <table_name> <key> - print value for specific key\n" \
"4) df-db dump - dump all tables\n" \

2
dragonflow/db/db_common.py
View File

@ -59,7 +59,7 @@ class DbUpdate(object):
def __lt__(self, other):
"""Implements priority among updates
Lower numerical priority always gets precedence. When comparing two
Lower numerical priority always gets precedence. When comparing two
updates of the same priority then the one with the earlier timestamp
gets procedence. In the unlikely event that the timestamps are also
equal it falls back to a simple comparison of ids meaning the

2
dragonflow/db/pubsub_drivers/zmq_pubsub_driver.py
View File

@ -164,7 +164,7 @@ class ZMQSubscriberAgentBase(pub_sub_api.SubscriberAgentBase):
def run(self):
self.sub_socket = self.connect()
LOG.info(_LI("Starting Subscriber on ports %(endpoints)s ")
LOG.info(_LI("Starting Subscriber on ports %(endpoints)s ")
% {'endpoints': str(self.uri_list)})
while True:
try:

2
dragonflow/tests/fullstack/test_l2_responder.py
View File

@ -94,7 +94,7 @@ class ArpResponderTest(test_base.DFTestBase):
utils.wait_until_true(
condition, timeout=40, sleep=1,
exception=RuntimeError(
"Timed out waiting for arp responedr flow from %(ip)s"
"Timed out waiting for arp responedr flow from %(ip)s"
" to be removed" % {'ip': ip}))
except Exception as e:
self.assertIsNone(e)