when enable vpn agent, no vpn related infomation is shown by running 'neutron agent list' .

[lee jian]

vpn agent is inherited from l3 agent, and use l3's report_status function to sync status, when running agent-list, we can not see its information , although vpn agent is enabled, this is confusing. So override its agent_state['binary'] to make admin know neutron-vpn-agent is running not the neutron-l3-agent, and leave the agent_type to 'L3 agent', which will be used to schedule router resource.
Here is the out before：
+--------------------------------------+--------------------+-------------------+-------+----------------+---------------------------+
| id | agent_type | host | alive | admin_state_up | binary |
+--------------------------------------+--------------------+-------------------+-------+----------------+---------------------------+
| 9070ec99-90f0-4fb6-b990-ba840986123a | DHCP agent | zy126.sce.ibm.com | :-) | True | neutron-dhcp-agent |
| 5f62b451-2ff7-4399-9225-d730b8a55e50 | Loadbalancer agent | zy126.sce.ibm.com | :-) | True | neutron-lbaas-agent |
| c02bfa52-eb2b-46a7-95ba-312cfcaaec44 | Open vSwitch agent | zy126.sce.ibm.com | :-) | True | neutron-openvswitch-agent |
| 46e2e710-8da3-4549-8502-524da817172c | Metadata agent | zy126.sce.ibm.com | :-) | True | neutron-metadata-agent |
| fc313849-fbdf-4244-9767-57d273bf7e55 | Open vSwitch agent | zy127.sce.ibm.com | :-) | True | neutron-openvswitch-agent |
| 84d4ae21-3095-4acb-ad1c-00004ff043a3 | L3 agent | zy126.sce.ibm.com | :-) | True | neutron-l3-agent |
+--------------------------------------+--------------------+-------------------+-------+----------------+---------------------------+

Here is the output after change the code:
 +--------------------------------------+--------------------+-------------------+-------+----------------+---------------------------+
| id | agent_type | host | alive | admin_state_up | binary |
+--------------------------------------+--------------------+-------------------+-------+----------------+---------------------------+
| 9070ec99-90f0-4fb6-b990-ba840986123a | DHCP agent | zy126.sce.ibm.com | :-) | True | neutron-dhcp-agent |
| 5f62b451-2ff7-4399-9225-d730b8a55e50 | Loadbalancer agent | zy126.sce.ibm.com | :-) | True | neutron-lbaas-agent |
| c02bfa52-eb2b-46a7-95ba-312cfcaaec44 | Open vSwitch agent | zy126.sce.ibm.com | :-) | True | neutron-openvswitch-agent |
| 46e2e710-8da3-4549-8502-524da817172c | Metadata agent | zy126.sce.ibm.com | :-) | True | neutron-metadata-agent |
| fc313849-fbdf-4244-9767-57d273bf7e55 | Open vSwitch agent | zy127.sce.ibm.com | :-) | True | neutron-openvswitch-agent |
| eb16d147-2242-48e0-92c5-08575d9e9d03 | L3 agent | zy126.sce.ibm.com | :-) | True | neutron-vpn-agent |
+--------------------------------------+--------------------+-------------------+-------+----------------+---------------------------+

[Akihiro Motoki (amotoki)]

https://review.openstack.org/#/c/199462/

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/199462
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=8c288cc768237200fc1639639fedb3524fa5958f
Submitter: Jenkins
Branch: master

commit 8c288cc768237200fc1639639fedb3524fa5958f
Author: leejian0612 <email address hidden>
Date: Wed Jul 8 17:28:23 2015 +0800

    Set vpn agent's agent_state['binary'] attribute

    No vpn agent related information is shown when running
    agent-list cmd, although it's enabled. Set vpn agent
    binary attribute to remind admin user that the vpn agent
    is active not the l3 agent.

    Change-Id: I7fa58f9a5a94f7fe4381c994ae425154a2a1c1d8
    Closes-Bug: #1472494

[lee jian (leejian0612)]

Hi, this patch may be helpful to kilo release, so I will pull it to kilo branch, thanks!

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/201457
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=fb18c46fb77720a9f7dadc556936fd237197327e
Submitter: Jenkins
Branch: stable/kilo

commit fb18c46fb77720a9f7dadc556936fd237197327e
Author: leejian0612 <email address hidden>
Date: Wed Jul 8 17:28:23 2015 +0800

    Set vpn agent's agent_state['binary'] attribute

    No vpn agent related information is shown when running
    agent-list cmd, although it's enabled. Set vpn agent
    binary attribute to remind admin user that the vpn agent
    is active not the l3 agent.

    Change-Id: I7fa58f9a5a94f7fe4381c994ae425154a2a1c1d8
    Closes-Bug: #1472494
    (cherry picked from commit 8c288cc768237200fc1639639fedb3524fa5958f)