vpnaas: multiple ipsec-site-connection per vpnservice doesn't work

[Hiroyuki Ito]

When creating the second ipsec-site-connection on a vpnservice, the first one is deleted on Neutron DB unintentionally and its deletion request isn't sent to midonet. It should not be deleted.

1. there is one ipsec-site-connection
(neutron) ipsec-site-connection-list -c id -c name -c vpnservice_id
+--------------------------------------+-------+--------------------------------------+
| id | name | vpnservice_id |
+--------------------------------------+-------+--------------------------------------+
| 8f004008-b7d8-4158-9db9-62dfe5c3cb26 | test1 | 847383a3-77e3-4d80-96bb-f0771df3d1ce |
+--------------------------------------+-------+--------------------------------------+

2. create second ipsec-site-connection on the same vpnservice
(neutron) ipsec-site-connection-create --name test2 --vpnservice-id 847383a3-77e3-4d80-96bb-f0771df3d1ce --ikepolicy-id 6b9789b4-5d5d-4714-898c-8b97e4d78082 --ips
ecpolicy-id bddcb54b-cab0-485a-92d9-31b9123b041c --peer-address 192.168.79.5 --peer-id 192.168.79.5 --peer-cidr 192.168.192.0/24 --psk test
Created a new ipsec_site_connection:
+-------------------+----------------------------------------------------+
| Field | Value |
+-------------------+----------------------------------------------------+
| admin_state_up | True |
| auth_mode | psk |
| description | |
| dpd | {"action": "hold", "interval": 30, "timeout": 120} |
| id | 14bc48ca-07b8-44a1-919f-4053def8b607 |
| ikepolicy_id | 6b9789b4-5d5d-4714-898c-8b97e4d78082 |
| initiator | bi-directional |
| ipsecpolicy_id | bddcb54b-cab0-485a-92d9-31b9123b041c |
| local_ep_group_id | |
| mtu | 1500 |
| name | test2 |
| peer_address | 192.168.79.5 |
| peer_cidrs | 192.168.192.0/24 |
| peer_ep_group_id | |
| peer_id | 192.168.79.5 |
| psk | test |
| route_mode | static |
| status | PENDING_CREATE |
| tenant_id | 83aeb56676354fdca1866d1fecfa1456 |
| vpnservice_id | 847383a3-77e3-4d80-96bb-f0771df3d1ce |
+-------------------+----------------------------------------------------+

3. the first one is deleted
(neutron) ipsec-site-connection-list -c id -c name -c vpnservice_id
+--------------------------------------+-------+--------------------------------------+
| id | name | vpnservice_id |
+--------------------------------------+-------+--------------------------------------+
| 14bc48ca-07b8-44a1-919f-4053def8b607 | test2 | 847383a3-77e3-4d80-96bb-f0771df3d1ce |
+--------------------------------------+-------+--------------------------------------+

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/260418
Committed: https://git.openstack.org/cgit/openstack/networking-midonet/commit/?id=53fc8bcb50a4a0319d530a25a79a50df4d68101a
Submitter: Jenkins
Branch: master

commit 53fc8bcb50a4a0319d530a25a79a50df4d68101a
Author: Hiroyuki Ito <email address hidden>
Date: Tue Dec 22 03:55:34 2015 +0000

    VPNaaS: Fix the case of multiple ipsec connections

    When creating the second ipsec-site-connection on a vpnservice, the
    first one is deleted on Neutron DB unintentionally.

    Stop updating python db object only for preventing the insertion of
    unused dictionary elements so that its update won't be reflected to DB.

    Closes-Bug: #1528417
    Change-Id: I12bebbf6d0940a804442b30b3d8fd51bbaf44255