if 'viccidev10' not in node.name:
nodes_dict[node.name] = node
- deployment = DeploymentNetwork.objects.filter(name='VICCI')
+ deployment = DeploymentNetwork.objects.filter(name='VICCI')[0]
login_bases = ['princeton', 'stanford', 'gt', 'uw', 'mpisws']
sites = Site.objects.filter(login_base__in=login_bases)
- nodes_per_site = len(nodes)/len(sites)
-
- def chunks(l, n):
- return [l[i:i+n] for i in range(0, len(l), n)]
-
# collect nova nodes:
compute_nodes = self.client.nova.hypervisors.list()
compute_nodes_dict[compute_node.hypervisor_hostname] = compute_node
# add new nodes:
- counter = 1
new_node_names = set(compute_nodes_dict.keys()).difference(nodes_dict.keys())
-
- def chunks(l, n):
- return [l[i:i+n] for i in range(0, len(l), n)]
-
- node_chunks = chunks(compute_nodes, nodes_per_site)
+ i = 0
+ max = len(sites)
for name in new_node_names:
- node = Node(name=compute_nodes_dict[name].hypervisor_hostname)
+ if i == max:
+ i = 0
+ site = sites[i]
+ node = Node(name=compute_nodes_dict[name].hypervisor_hostname,
+ site=site,
+ deploymentNetwork=deployment)
node.save()
+ i+=1
# remove old nodes
old_node_names = set(nodes_dict.keys()).difference(compute_nodes_dict.keys())
Node.objects.filter(name__in=old_node_names).delete()
- def refresh_flavors(self):
- # collect local flavors
- from plstackapi.core.models import Flavor
- flavors = Flavor.objects.all()
- flavors_dict = {}
- for flavor in flavors:
- flavors_dict[flavor.name] = flavor
-
- # collect nova falvors
- nova_flavors = self.client.nova.flavors.list()
- nova_flavors_dict = {}
- for nova_flavor in nova_flavors:
- nova_flavors_dict[nova_flavor.name] = nova_flavor
-
- # add new flavors
- new_flavor_names = set(nova_flavors_dict.keys()).difference(flavors_dict.keys())
- for name in new_flavor_names:
-
- flavor = Flavor(flavor_id=nova_flavors_dict[name].id,
- name=nova_flavors_dict[name].name,
- memory_mb=nova_flavors_dict[name].ram,
- disk_gb=nova_flavors_dict[name].disk,
- vcpus=nova_flavors_dict[name].vcpus)
- flavor.save()
-
- # remove old flavors
- old_flavor_names = set(flavors_dict.keys()).difference(nova_flavors_dict.keys())
- Flavor.objects.filter(name__in=old_flavor_names).delete()
-
def refresh_images(self):
# collect local images
from plstackapi.core.models import Image