Code Review
/
integration
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Updated code to match new rules
[integration/test.git]
/
tools
/
odl-ovsdb-performance-tests
/
ovsdbconfigblaster.py
diff --git
a/tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py
b/tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py
index 7065909ffac9a2ec4cb7ecef323c1c8ea4b14180..2be7fc1d7a23f1ffcc08db5a84a3b36ee956fe3d 100644
(file)
--- a/
tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py
+++ b/
tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py
@@
-1,6
+1,11
@@
"""
Script to add bridges/ports/termination points to ovsdb config
"""
"""
Script to add bridges/ports/termination points to ovsdb config
"""
+import argparse
+import logging
+import requests
+
+
__author__ = 'Marcus Williams'
__copyright__ = "Copyright (c) 2015, Intel Corp Inc., Cisco Systems Inc. and others"
__credits__ = ["Jan Medved, Lori Jakab"]
__author__ = 'Marcus Williams'
__copyright__ = "Copyright (c) 2015, Intel Corp Inc., Cisco Systems Inc. and others"
__credits__ = ["Jan Medved, Lori Jakab"]
@@
-8,10
+13,6
@@
__license__ = "New-style BSD"
__email__ = "marcus.williams@intel.com"
__version__ = "0.0.1"
__email__ = "marcus.williams@intel.com"
__version__ = "0.0.1"
-import argparse
-import logging
-import requests
-
class OvsdbConfigBlaster (object):
PUT_HEADERS = {'Content-Type': 'application/json',
class OvsdbConfigBlaster (object):
PUT_HEADERS = {'Content-Type': 'application/json',
@@
-102,19
+103,18
@@
class OvsdbConfigBlaster (object):
'ip': vswitch_ip,
'remote-ip': vswitch_remote_ip,
'ovsdb-port': vswitch_ovsdb_port,
'ip': vswitch_ip,
'remote-ip': vswitch_remote_ip,
'ovsdb-port': vswitch_ovsdb_port,
- 'node-id': 'ovsdb://%s:%s'
- % (vswitch_ip,
- vswitch_ovsdb_port),
- 'post-url': urlprefix
- + OvsdbConfigBlaster.return_ovsdb_url(
+ 'node-id': 'ovsdb://%s:%s' %
+ (vswitch_ip, vswitch_ovsdb_port),
+ 'post-url': urlprefix +
+ OvsdbConfigBlaster.return_ovsdb_url(
vswitch_ip,
vswitch_ovsdb_port),
vswitch_ip,
vswitch_ovsdb_port),
- 'get-config-url': urlprefix
-
+
OvsdbConfigBlaster.return_ovsdb_url(
+ 'get-config-url': urlprefix
+
+ OvsdbConfigBlaster.return_ovsdb_url(
vswitch_ip,
vswitch_ovsdb_port),
vswitch_ip,
vswitch_ovsdb_port),
- 'get-oper-url': urlprefix
-
+
OvsdbConfigBlaster.return_ovsdb_url(
+ 'get-oper-url': urlprefix
+
+ OvsdbConfigBlaster.return_ovsdb_url(
vswitch_ip,
vswitch_ovsdb_port)}})
vswitch_ip,
vswitch_ovsdb_port)}})
@@
-181,9
+181,9
@@
class OvsdbConfigBlaster (object):
}
self.send_rest(self.session,
self.vswitch_dict[vswitch_name]
}
self.send_rest(self.session,
self.vswitch_dict[vswitch_name]
- .get('post-url')
- + '%2Fbridge%2F'
-
+
bridge_name,
+ .get('post-url')
+
+ '%2Fbridge%2F' +
+ bridge_name,
add_bridge_body)
self.session.close()
add_bridge_body)
self.session.close()