projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
rwcal
/
plugins
/
vala
/
rwcal_openstack
/
rift
/
rwcal
/
openstack
/
neutron
/
neutron_drv.py
diff --git
a/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/neutron/neutron_drv.py
b/rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/neutron/neutron_drv.py
index
ebb32d2
..
1e3f590
100644
(file)
--- a/
rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/neutron/neutron_drv.py
+++ b/
rwcal/plugins/vala/rwcal_openstack/rift/rwcal/openstack/neutron/neutron_drv.py
@@
-246,7
+246,7
@@
class NeutronDriver(object):
"""
networks = self._network_find(**{'id': network_id, 'name': network_name})
if not networks:
"""
networks = self._network_find(**{'id': network_id, 'name': network_name})
if not networks:
- r
aise NeutronException.NotFound("Could not find network. Network id: %s, Network name: %s " %(network_id, network_name))
+ r
eturn None
return networks[0]
return networks[0]
@@
-404,7
+404,7
@@
class NeutronDriver(object):
security_groups : A List of Neutron security group Ids
}
Returns:
security_groups : A List of Neutron security group Ids
}
Returns:
- A list of port
_id (string)
+ A list of port
s { port_id (string), tag (connection_name, string) }
"""
params = dict()
params['ports'] = ports
"""
params = dict()
params['ports'] = ports
@@
-414,7
+414,7
@@
class NeutronDriver(object):
except Exception as e:
self.log.exception("Ports Create operation failed. Exception: %s",str(e))
raise
except Exception as e:
self.log.exception("Ports Create operation failed. Exception: %s",str(e))
raise
- return [
p['id']
for p in ports['ports'] ]
+ return [
{ "id": p['id'], "tag": p['name'] }
for p in ports['ports'] ]
def port_update(self, port_id, no_security_groups=None,port_security_enabled=None):
def port_update(self, port_id, no_security_groups=None,port_security_enabled=None):