git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
blind and brutal 2to3
[nodemanager.git]
/
plugins
/
interfaces.py
diff --git
a/plugins/interfaces.py
b/plugins/interfaces.py
index
bc24b4e
..
fe303a3
100644
(file)
--- a/
plugins/interfaces.py
+++ b/
plugins/interfaces.py
@@
-5,7
+5,7
@@
Configure interfaces inside a container by pulling down files via URL.
import logger
import os
import curlwrapper
import logger
import os
import curlwrapper
-import xmlrpc
lib
+import xmlrpc
.client
try:
from hashlib import sha1 as sha
except ImportError:
try:
from hashlib import sha1 as sha
except ImportError:
@@
-55,7
+55,7
@@
def GetSlivers(data, config=None, plc=None):
url = mydict['url']
try:
contents = curlwrapper.retrieve(url)
url = mydict['url']
try:
contents = curlwrapper.retrieve(url)
- except xmlrpc
lib
.ProtocolError as e:
+ except xmlrpc
.client
.ProtocolError as e:
logger.log('interfaces (%s): failed to retrieve %s' % (slicename, url))
continue
else:
logger.log('interfaces (%s): failed to retrieve %s' % (slicename, url))
continue
else:
@@
-66,7
+66,7
@@
def GetSlivers(data, config=None, plc=None):
logger.log('interfaces (%s): no DEVICE specified' % slicename)
continue
logger.log('interfaces (%s): no DEVICE specified' % slicename)
continue
- for key, value in
mydict.items(
):
+ for key, value in
list(mydict.items()
):
if key in ['bridge', 'vlan']:
continue
contents += '%s="%s"\n' % (key, value)
if key in ['bridge', 'vlan']:
continue
contents += '%s="%s"\n' % (key, value)