class SyncControllerNetworks(OpenStackSyncStep):
requested_interval = 0
- provides=[Network, ControllerNetworks, Sliver]
+ provides=[ControllerNetwork, Network]
def alloc_subnet(self, uuid):
a = 10
def fetch_pending(self, deleted):
if (deleted):
- return ControllerNetworks.deleted_objects.all()
+ return ControllerNetwork.deleted_objects.all()
else:
- return ControllerNetworks.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
+ return ControllerNetwork.objects.filter(Q(enacted__lt=F('updated')) | Q(enacted=None))
def save_controller_network(self, controller_network):
network_fields = {'endpoint':controller_network.controller.auth_url,
'admin_user':slice.creator.email, # XXX: FIXME
- 'tenant_name':slice.slicename, # XXX: FIXME
- 'admin_password':controller_network.controller.admin_password,
+ 'tenant_name':slice.name, # XXX: FIXME
+ 'admin_password':slice.creator.remote_password,
'name':network_name,
'subnet_name':subnet_name,
'ansible_tag':'%s-%s@%s'%(network_name,slice.slicename,controller_network.controller.name),