OW2 Consortium contrail

Rev

Rev 2729 | Rev 3198 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2729 Rev 2792
Line 150... Line 150...
150 
                self.__logger.debug('[_create_nodes]: %d nodes ' \
150 
                self.__logger.debug('[_create_nodes]: %d nodes ' \
151 
                                    'failed to startup properly: %s' \
151 
                                    'failed to startup properly: %s' \
152 
                                    % (len(failed), str(failed)))
152 
                                    % (len(failed), str(failed)))
153 
                self.__kill_nodesById([i['id'] for i in failed])
153 
                self.__kill_nodesById([i['id'] for i in failed])
154
154
155 
        additional_nodes = [ ServiceNode(i['id'], i['ip'], \
- 
 
- 
 
 155 
        additional_nodes = [ ServiceNode(i['id'], i['ip'], i['private_ip'], \
156 
                                         self.__default_cloud.get_cloud_name()) \
156 
                                         self.__default_cloud.get_cloud_name()) \
157 
                                         for i in ready ]
157 
                                         for i in ready ]
158 
        self.__force_terminate_lock.acquire()
158 
        self.__force_terminate_lock.acquire()
159 
        #self.__created_nodes += additional_nodes
159 
        #self.__created_nodes += additional_nodes
160 
        self.__created_nodes += [ i['id'] for i in ready ]
160 
        self.__created_nodes += [ i['id'] for i in ready ]
Line 301... Line 301...
301 
      while len(nodes) > 0:
301 
      while len(nodes) > 0:
302 
        poll_cycles += 1
302 
        poll_cycles += 1
303 
        for i in nodes:
303 
        for i in nodes:
304 
          up = True
304 
          up = True
305 
          try:
305 
          try:
306 
            if i['ip'] != '':
- 
 
- 
 
 306 
            if i['ip'] != '' and i['private_ip'] != '':
307 
              test_agent(i['ip'], port)
307 
              test_agent(i['ip'], port)
308 
            else:
308 
            else:
309 
              up = False
309 
              up = False
310 
          except: up = False
310 
          except: up = False
311 
          if up:
311 
          if up:
Line 317... Line 317...
317 
            return (done, nodes)
317 
            return (done, nodes)
318
318
319 
          self.__logger.debug('[_wait_for_nodes]: waiting for %d nodes' \
319 
          self.__logger.debug('[_wait_for_nodes]: waiting for %d nodes' \
320 
                            % len(nodes))
320 
                            % len(nodes))
321 
          time.sleep(poll_interval)
321 
          time.sleep(poll_interval)
322 
          no_ip_nodes = [ i for i in nodes if i['ip'] == '' ]
- 
 
- 
 
 322 
          no_ip_nodes = [ i for i in nodes if i['ip'] == '' or i['private_ip'] == '']
323 
          if no_ip_nodes:
323 
          if no_ip_nodes:
324 
            self.__logger.debug('[_wait_for_nodes]: refreshing %d nodes' \
324 
            self.__logger.debug('[_wait_for_nodes]: refreshing %d nodes' \
325 
                              % len(no_ip_nodes))
325 
                              % len(no_ip_nodes))
326 
            refreshed_list = self.__default_cloud.list_vms()
326 
            refreshed_list = self.__default_cloud.list_vms()
327 
            for i in no_ip_nodes:
327 
            for i in no_ip_nodes:
328 
              i['ip'] = refreshed_list[i['id']]['ip']
328 
              i['ip'] = refreshed_list[i['id']]['ip']
- 
 
 329 
              i['private_ip'] = refreshed_list[i['id']]['private_ip']
329 
      self.__logger.debug('[_wait_for_nodes]: All nodes are ready %s' \
330 
      self.__logger.debug('[_wait_for_nodes]: All nodes are ready %s' \
330 
                        % str(done))
331 
                        % str(done))
331 
      return (done, [])
332 
      return (done, [])
332
333
333 
    def _get_context_file(self, service_name, cloud):
334 
    def _get_context_file(self, service_name, cloud):