vpn_connection.py (ec2-api-14.0.1) | : | vpn_connection.py (ec2-api-15.0.0) | ||
---|---|---|---|---|
skipping to change at line 22 | skipping to change at line 22 | |||
# See the License for the specific language governing permissions and | # See the License for the specific language governing permissions and | |||
# limitations under the License. | # limitations under the License. | |||
import random | import random | |||
import string | import string | |||
from lxml import etree | from lxml import etree | |||
import netaddr | import netaddr | |||
from neutronclient.common import exceptions as neutron_exception | from neutronclient.common import exceptions as neutron_exception | |||
from oslo_log import log as logging | from oslo_log import log as logging | |||
import six | ||||
from ec2api.api import common | from ec2api.api import common | |||
from ec2api.api import ec2utils | from ec2api.api import ec2utils | |||
from ec2api import clients | from ec2api import clients | |||
from ec2api.db import api as db_api | from ec2api.db import api as db_api | |||
from ec2api import exception | from ec2api import exception | |||
from ec2api.i18n import _ | from ec2api.i18n import _ | |||
LOG = logging.getLogger(__name__) | LOG = logging.getLogger(__name__) | |||
skipping to change at line 312 | skipping to change at line 311 | |||
'mode': os_ipsecpolicy['encapsulation_mode'], | 'mode': os_ipsecpolicy['encapsulation_mode'], | |||
'tcp_mss_adjustment': ( | 'tcp_mss_adjustment': ( | |||
os_ipsec_site_connection['mtu'] - MTU_MSS_DELTA | os_ipsec_site_connection['mtu'] - MTU_MSS_DELTA | |||
if os_ipsec_site_connection else | if os_ipsec_site_connection else | |||
AWS_MSS), | AWS_MSS), | |||
} | } | |||
return config_dict | return config_dict | |||
def _stop_vpn_connection(neutron, vpn_connection): | def _stop_vpn_connection(neutron, vpn_connection): | |||
connection_ids = vpn_connection['os_ipsec_site_connections'] | connection_ids = vpn_connection['os_ipsec_site_connections'] | |||
for os_connection_id in six.itervalues(connection_ids): | for os_connection_id in connection_ids.values(): | |||
try: | try: | |||
neutron.delete_ipsec_site_connection(os_connection_id) | neutron.delete_ipsec_site_connection(os_connection_id) | |||
except neutron_exception.NotFound: | except neutron_exception.NotFound: | |||
pass | pass | |||
def _stop_gateway_vpn_connections(context, neutron, cleaner, vpn_gateway): | def _stop_gateway_vpn_connections(context, neutron, cleaner, vpn_gateway): | |||
def undo_vpn_connection(context, vpn_connection, connections_ids): | def undo_vpn_connection(context, vpn_connection, connections_ids): | |||
vpn_connection['os_ipsec_site_connections'] = connections_ids | vpn_connection['os_ipsec_site_connections'] = connections_ids | |||
db_api.update_item(context, vpn_connection) | db_api.update_item(context, vpn_connection) | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 1 lines changed or added |