def backend_icon(obj): # backend_status, enacted, updated):
#return "%s %s %s" % (str(obj.updated), str(obj.enacted), str(obj.backend_status))
- if (obj.enacted is not None) and obj.enacted >= obj.updated:
+ if (obj.enacted is not None) and obj.enacted >= obj.updated or obj.backend_status.startswith("1 -"):
return '<span style="min-width:16px;"><img src="/static/admin/img/icon_success.gif"></span>'
else:
if ((obj.backend_status is not None) and obj.backend_status.startswith("0 -")) or obj.backend_status == "Provisioning in progress" or obj.backend_status=="":
import imp
import inspect
import time
+import sys
import traceback
import commands
import threading
import json
import pdb
+import pprint
+
from datetime import datetime
from collections import defaultdict
try:
# This contains dependencies between records, not sync steps
self.model_dependency_graph = json.loads(open(dep_path).read())
+ for lst in self.model_dependency_graph.values():
+ for k in lst:
+ try:
+ deps = self.model_dependency_graph[k]
+ except:
+ self.model_dependency_graph[k] = []
except Exception,e:
raise e
for k,v in self.model_dependency_graph.iteritems():
try:
for source in provides_dict[k]:
+ if (not v):
+ step_graph[source] = []
+
for m in v:
try:
for dest in provides_dict[m]:
self.dependency_graph = step_graph
self.deletion_dependency_graph = invert_graph(step_graph)
+ pp = pprint.PrettyPrinter(indent=4)
+ pp.pprint(step_graph)
self.ordered_steps = toposort(self.dependency_graph, map(lambda s:s.__name__,self.sync_steps))
+ #self.ordered_steps = ['SyncRoles', 'SyncControllerSites', 'SyncControllerSitePrivileges','SyncImages', 'SyncControllerImages','SyncControllerUsers','SyncControllerUserSitePrivileges','SyncControllerSlices', 'SyncControllerSlicePrivileges', 'SyncControllerUserSlicePrivileges', 'SyncControllerNetworks','SyncSlivers']
+ #self.ordered_steps = ['SyncControllerSites']
+
print "Order of steps=",self.ordered_steps
+
self.load_run_times()
except KeyError:
has_deps = False
- go = False
+ go = True
+ failed_dep = None
if (has_deps):
for d in deps:
if d==step.__name__:
if (self.step_status[d] is STEP_STATUS_WORKING):
logger.info(" step %s wait on dep %s" % (step.__name__, d))
cond.wait()
+ elif self.step_status[d] == STEP_STATUS_OK:
+ go = True
+ else:
+ go = False
+ failed_dep = d
cond.release()
- go = go or self.step_status[d] == STEP_STATUS_OK
+ if (not go):
+ break
else:
go = True
if (not go):
+ print bcolors.FAIL + "Step %r skipped on %r" % (step,failed_dep) + bcolors.ENDC
# SMBAKER: sync_step was not defined here, so I changed
# this from 'sync_step' to 'step'. Verify.
self.failed_steps.append(step)
logger.info('Executing step %s' % sync_step.__name__)
+ print bcolors.OKBLUE + "Executing step %s" % sync_step.__name__ + bcolors.ENDC
failed_objects = sync_step(failed=list(self.failed_step_objects), deletion=deletion)
self.check_duration(sync_step, duration)
self.failed_step_objects.update(failed_objects)
logger.info("Step %r succeeded" % step)
+ print bcolors.OKGREEN + "Step %r succeeded" % step + bcolors.ENDC
my_status = STEP_STATUS_OK
self.update_run_time(sync_step,deletion)
except Exception,e:
+ print bcolors.FAIL + "Model step %r failed" % (step) + bcolors.ENDC
logger.error('Model step %r failed. This seems like a misconfiguration or bug: %r. This error will not be relayed to the user!' % (step, e))
logger.log_exc(e)
self.failed_steps.append(S)
logger = Logger(level=logging.INFO)
class SyncControllerImages(OpenStackSyncStep):
- provides=[ControllerImages, Image]
+ provides=[ControllerImages]
requested_interval=0
def fetch_pending(self, deleted):
image_id = res[0]['id']
controller_image.glance_image_id = image_id
+ controller_image.backend_status = '1 - OK'
controller_image.save()
class SyncControllerNetworks(OpenStackSyncStep):
requested_interval = 0
- provides=[ControllerNetwork, Network]
+ provides=[Network]
def alloc_subnet(self, uuid):
# 16 bits only
controller_network.net_id = network_id
controller_network.subnet = cidr
controller_network.subnet_id = subnet_id
+ controller_network.backend_status = '1 - OK'
controller_network.save()
logger = Logger(level=logging.INFO)
class SyncControllerSitePrivileges(OpenStackSyncStep):
- provides=[ControllerSitePrivilege, SitePrivilege]
+ provides=[SitePrivilege]
requested_interval=0
def fetch_pending(self, deleted):
class SyncControllerSites(OpenStackSyncStep):
requested_interval=0
- provides=[ControllerSite, Site]
+ provides=[Site]
def fetch_pending(self, deleted=False):
pending = super(OpenStackSyncStep, self).fetch_pending(deleted)
res = run_template('sync_controller_sites.yaml', tenant_fields, path='controller_sites', expected_num=1)
controller_site.tenant_id = res[0]['id']
+ controller_site.backend_status = '1 - OK'
controller_site.save()
def delete_record(self, controller_site):
logger = Logger(level=logging.INFO)
class SyncControllerSlicePrivileges(OpenStackSyncStep):
- provides=[ControllerSlicePrivilege, SlicePrivilege]
+ provides=[SlicePrivilege]
requested_interval=0
def fetch_pending(self, deleted):
logger = Logger(level=logging.INFO)
class SyncControllerSlices(OpenStackSyncStep):
- provides=[ControllerSlice, Slice]
+ provides=[Slice]
requested_interval=0
def fetch_pending(self, deleted):
raise Exception('Could not update quota for %s'%controller_slice.slice.name)
controller_slice.tenant_id = tenant_id
+ controller_slice.backend_status = '1 - OK'
controller_slice.save()
logger = Logger(level=logging.INFO)
class SyncControllerUsers(OpenStackSyncStep):
- provides=[ControllerUser, User]
+ provides=[User]
requested_interval=0
def fetch_pending(self, deleted):
res = run_template('sync_controller_users.yaml', user_fields,path='controller_users', expected_num=expected_length)
controller_user.kuser_id = res[0]['id']
+ controller_user.backend_status = '1 - OK'
controller_user.save()
def delete_record(self, controller_user):
try:
for m in g[n]:
if (m in unmarked):
- if (m not in stack):
- add = False
- stack.insert(0,m)
- else:
- # Should not happen, if so there's a loop
- print 'Loop at %s'%m
+ add = False
+ stack.insert(0,m)
except KeyError:
pass
if (add):
- if (n in steps):
+ if (n in steps and n not in order):
order.append(n)
item = stack.pop(0)
- unmarked.remove(item)
+ try:
+ unmarked.remove(item)
+ except ValueError:
+ pass
noorder = list(set(steps) - set(order))
return order + noorder
git://git.onelab.eu / plstackapi.git / commitdiff