vpnstateinvalid has confusing message

[yong sheng gong]

after I create an vpnservice without a name, and then I want to update it with a name, the following msg come out:

2013-12-02 12:09:18.691 3623 ERROR neutron.api.v2.resource [req-aab03b48-08a4-415f-9cd1-7ee4f5a16b19 8fb8b278e48e4d0cbde162e5626032a1 c3b9072bc0f741aa98f72e794dba7ea6] update failed
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource Traceback (most recent call last):
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource File "/mnt/data/opt/stack/neutron/neutron/api/v2/resource.py", line 84, in resource
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource result = method(request=request, **args)
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource File "/mnt/data/opt/stack/neutron/neutron/api/v2/base.py", line 492, in update
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource obj = obj_updater(request.context, id, **kwargs)
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource File "/mnt/data/opt/stack/neutron/neutron/db/vpn/vpn_db.py", line 579, in update_vpnservice
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource self.assert_update_allowed(vpns_db)
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource File "/mnt/data/opt/stack/neutron/neutron/db/vpn/vpn_db.py", line 198, in assert_update_allowed
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource raise vpnaas.VPNStateInvalid(id=id, state=status)
2013-12-02 12:09:18.691 3623 TRACE neutron.api.v2.resource VPNStateInvalid: Invalid state PENDING_CREATE of vpnaas resource <built-in function id>

There are two problems in above msg:
1. built-in function id
2. the msg itself: I think we can use: the vpn service cannot be updated when it is in state PENDING_CREATE

but I think we should be able to modify the vpn service when it is not used by IPsecSiteConnection

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/59562
Committed: http://github.com/openstack/neutron/commit/3f110c9a571249c6626ebd1ef7dbf67b71273fa5
Submitter: Jenkins
Branch: master

commit 3f110c9a571249c6626ebd1ef7dbf67b71273fa5
Author: Yong Sheng Gong <email address hidden>
Date: Mon Dec 2 15:17:39 2013 +0800

    update error msg for invalid state to update vpn resources

    Change-Id: I6719fa359d0c14accfa8b9b440c2b7fbabbdcfdb
    Closes-Bug: #1256766