The exception type is wrong and makes the except block not work

[Hong Hui Xiao]

With many ha routers, I restart the l3-agent. And find error in the log:

2015-10-14 22:24:19.640 31246 INFO eventlet.wsgi.server [-] Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/eventlet/wsgi.py", line 442, in handle_one_response
    result = self.application(self.environ, start_response)
  File "/usr/lib/python2.7/dist-packages/webob/dec.py", line 130, in __call__
    resp = self.call_func(req, *args, **self.kwargs)
  File "/usr/lib/python2.7/dist-packages/webob/dec.py", line 195, in call_func
    return self.func(req, *args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/neutron/agent/l3/ha.py", line 59, in __call__
    self.enqueue(router_id, state)
  File "/usr/lib/python2.7/dist-packages/neutron/agent/l3/ha.py", line 65, in enqueue
    self.agent.enqueue_state_change(router_id, state)
  File "/usr/lib/python2.7/dist-packages/neutron/agent/l3/ha.py", line 119, in enqueue_state_change
    ri = self.router_info[router_id]
KeyError: 'aec00e20-ebe0-4979-858b-cb411dcd1bb6'

Checking code, and find that

def enqueue_state_change(self, router_id, state):
        LOG.info(_LI('Router %(router_id)s transitioned to %(state)s'),
                 {'router_id': router_id,
                  'state': state})

        try:
            ri = self.router_info[router_id]
        except AttributeError:
            LOG.info(_LI('Router %s is not managed by this agent. It was '
                         'possibly deleted concurrently.'), router_id)
            return

KeyError should be expected here according to the context.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/236008

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/236008
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=9d6584120003f50782461677d1b783bd07131444
Submitter: Jenkins
Branch: master

commit 9d6584120003f50782461677d1b783bd07131444
Author: Hong Hui Xiao <email address hidden>
Date: Fri Oct 16 12:39:32 2015 -0400

    The exception type is wrong and makes the except block not work

    According to the context, it should be KeyError here to catch.
    AttributeError will not happen here. More details could be found
    in the bug report.

    Change-Id: Id6351172703ac492e86475f75bf1be03f4e4e8a3
    Closes-bug: #1506934

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/kilo
Review: https://review.openstack.org/236885

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/236886

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/236885
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=6308d78259cef26eace366a07c75abfa34840438
Submitter: Jenkins
Branch: stable/kilo

commit 6308d78259cef26eace366a07c75abfa34840438
Author: Hong Hui Xiao <email address hidden>
Date: Fri Oct 16 12:39:32 2015 -0400

    The exception type is wrong and makes the except block not work

    According to the context, it should be KeyError here to catch.
    AttributeError will not happen here. More details could be found
    in the bug report.

    Change-Id: Id6351172703ac492e86475f75bf1be03f4e4e8a3
    Closes-bug: #1506934
    (cherry picked from commit 9d6584120003f50782461677d1b783bd07131444)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/236886
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=0b5285aeccb482617b676e2c1278f829adc8cc2a
Submitter: Jenkins
Branch: stable/liberty

commit 0b5285aeccb482617b676e2c1278f829adc8cc2a
Author: Hong Hui Xiao <email address hidden>
Date: Fri Oct 16 12:39:32 2015 -0400

    The exception type is wrong and makes the except block not work

    According to the context, it should be KeyError here to catch.
    AttributeError will not happen here. More details could be found
    in the bug report.

    Change-Id: Id6351172703ac492e86475f75bf1be03f4e4e8a3
    Closes-bug: #1506934
    (cherry picked from commit 9d6584120003f50782461677d1b783bd07131444)