~niedbalski/ubuntu/vivid/neutron/fixes-1447803

« back to all changes in this revision

Viewing changes to neutron/agent/l3_agent.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Corey Bryant
  • Date: 2014-10-15 11:23:42 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20141015112342-6zg3y3f02affb74c
Tags: 1:2014.2~rc3-0ubuntu1
[ Corey Bryant ]
New upstream release candidate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
523
523
        self.context = context.get_admin_context_without_session()
524
524
        self.plugin_rpc = L3PluginApi(topics.L3PLUGIN, host)
525
525
        self.fullsync = True
526
 
        self.updated_routers = set()
527
 
        self.removed_routers = set()
528
526
        self.sync_progress = False
529
527
 
530
528
        # Get the list of service plugins from Neutron Server
1843
1841
        while True:
1844
1842
            pool.spawn_n(self._process_router_update)
1845
1843
 
1846
 
    def _process_router_delete(self):
1847
 
        current_removed_routers = list(self.removed_routers)
1848
 
        for router_id in current_removed_routers:
1849
 
            self._router_removed(router_id)
1850
 
            self.removed_routers.remove(router_id)
1851
 
 
1852
1844
    def _router_ids(self):
1853
1845
        if not self.conf.use_namespaces:
1854
1846
            return [self.conf.router_id]
1874
1866
 
1875
1867
        try:
1876
1868
            router_ids = self._router_ids()
1877
 
            self.updated_routers.clear()
1878
 
            self.removed_routers.clear()
1879
1869
            timestamp = timeutils.utcnow()
1880
1870
            routers = self.plugin_rpc.get_routers(
1881
1871
                context, router_ids)