X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fopenstack%2Fosaggregate.py;h=c165cfbe79d1807f2181ceefc2491b8fb954fc36;hb=860ec9f71f3b0f7c6836b1f1bd24c256f36b2b69;hp=521cbb8d64aec3f438627a9a61ba6bb4a0d4ab1e;hpb=b2d364d6a5ae686fe9f9f14f895f89b6a2829210;p=sfa.git diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 521cbb8d..c165cfbe 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -49,7 +49,7 @@ class OSAggregate: def get_slice_nodes(self, slice_xrn): name = OSXrn(xrn = slice_xrn).name - instances = self.driver.instance_get_all_by_project(name) + instances = self.driver.shell.instance_get_all_by_project(name) rspec_nodes = [] for instance in instances: rspec_node = Node() @@ -64,7 +64,7 @@ class OSAggregate: def get_aggregate_nodes(self): - zones = self.driver.zone_get_all() + zones = self.driver.shell.zone_get_all() if not zones: zones = ['cloud'] else: @@ -80,7 +80,7 @@ class OSAggregate: rspec_node['exclusive'] = 'false' rspec_node['hardware_types'] = [HardwareType({'name': 'plos-pc'}), HardwareType({'name': 'pc'})] - instances = self.driver.instance_type_get_all().values() + instances = self.driver.shell.instance_type_get_all().values() slivers = [self.instance_to_sliver(inst) for inst in instances] rspec_node['slivers'] = slivers rspec_nodes.append(rspec_node)