git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
89002d7
)
pushing essex changes
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 28 Jun 2012 15:18:35 +0000
(11:18 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Thu, 28 Jun 2012 15:18:35 +0000
(11:18 -0400)
sfa/openstack/nova_shell.py
patch
|
blob
|
history
diff --git
a/sfa/openstack/nova_shell.py
b/sfa/openstack/nova_shell.py
index
1d3c0e4
..
c597729
100644
(file)
--- a/
sfa/openstack/nova_shell.py
+++ b/
sfa/openstack/nova_shell.py
@@
-14,7
+14,7
@@
try:
from nova.compute.manager import ComputeManager
from nova.network.manager import NetworkManager
from nova.scheduler.manager import SchedulerManager
from nova.compute.manager import ComputeManager
from nova.network.manager import NetworkManager
from nova.scheduler.manager import SchedulerManager
- from sfa.openstack.client import GlanceClient
+ from sfa.openstack.client import GlanceClient
, NovaClient
has_nova = True
except:
has_nova = False
has_nova = True
except:
has_nova = False
@@
-49,24
+49,13
@@
class NovaShell:
def __init__ ( self, config ) :
if not config:
config = Config()
def __init__ ( self, config ) :
if not config:
config = Config()
- self.auth_manager = None
- self.compute_manager = None
- self.network_manager = None
- self.scheduler_manager = None
- self.db = None
self.image_manager = None
self.image_manager = None
+ self.nova_manager = None
if has_nova:
if has_nova:
- logger.debug('nova access - native')
- # load the config
- flags.FLAGS(['foo', '--flagfile=/etc/nova/nova.conf', 'foo', 'foo'])
# instantiate managers
# instantiate managers
- self.auth_manager = AuthManager()
- self.compute_manager = ComputeManager()
- self.network_manager = NetworkManager()
- self.scheduler_manager = SchedulerManager()
- self.db = InjectContext(db, context.get_admin_context())
self.image_manager = GlanceClient(config)
self.image_manager = GlanceClient(config)
+ self.nova_manager = NovaClient(config)
else:
logger.debug('nova access - REST')
raise SfaNotImplemented('nova access - Rest')
else:
logger.debug('nova access - REST')
raise SfaNotImplemented('nova access - Rest')