Improve NAT-GW

.travis.yml

@@ -5,6 +5,8 @@ matrix:
   include:
   - python: 3.6
     env: TOXENV=py36
+  - python: 3.7
+    env: TOXENV=py37
   - python: 3.6
     env: TOXENV=pep8
 install: pip install tox

doc/source/sdk/proxies/index.rst

@@ -14,10 +14,11 @@ Service Proxies
    Distributed Message Service (DMS) <dms>
    Domain Name Server Service (DNS) <dns>
    Key Management Service (KMS) <kms>
+   Network Address Translation (NAT) <nat>
    Object Block Storage (OBS) <obs>
-   Volume Backup Service (VBS) <volume_backup>
    Relational Database Service RDS V1 (RDSv1) <rds_v1>
    Relational Database Service RDS V3 (RDS) <rds_v3>
+   Volume Backup Service (VBS) <volume_backup>
 
 .. _service-proxies:
 

doc/source/sdk/proxies/nat.rst

@@ -0,0 +1,34 @@
+NAT API
+=======
+
+.. automodule:: otcextensions.sdk.nat.v2._proxy
+
+The Network Address Translation Class
+-------------------------------------
+
+The nat high-level interface is available through the ``nat``
+member of a :class:`~openstack.connection.Connection` object.  The
+``nat`` member will only be added if the
+``otcextensions.sdk.register_otc_extensions(conn)`` method is called.
+
+Gateway Operations
+^^^^^^^^^^^^^^^^^^
+
+.. autoclass:: otcextensions.sdk.nat.v2._proxy.Proxy
+  :noindex:
+  :members: gateways, find_gateway,
+            create_gateway, update_gateway, delete_gateway
+
+SNAT Rule Operations
+^^^^^^^^^^^^^^^^^^^^
+
+.. autoclass:: otcextensions.sdk.nat.v2._proxy.Proxy
+  :noindex:
+  :members: snat_rules, get_snat_rule, create_snat_rule, delete_snat_rule
+
+DNAT Rule Operations
+^^^^^^^^^^^^^^^^^^^^
+
+.. autoclass:: otcextensions.sdk.nat.v2._proxy.Proxy
+  :noindex:
+  :members: dnat_rules, get_dnat_rule, create_dnat_rule, delete_dnat_rule

doc/source/sdk/resources/index.rst

@@ -16,6 +16,7 @@ Open Telekom Cloud Resources
    Distributed Message Service (DMS) <dms/index>
    Domain Name Service (DNS) <dns/index>
    Key Management Service (KMS) <kms/index>
+   Network Address Translation (NAT) <nat/index>
    Object Block Storage (OBS) <obs/index>
    Relational Database Service (RDS) <rds/index>
 

doc/source/sdk/resources/nat/index.rst

@@ -0,0 +1,9 @@
+NAT Resources
+=============
+
+.. toctree::
+   :maxdepth: 1
+
+   v2/gateway
+   v2/snat
+   v2/dnat

doc/source/sdk/resources/nat/v2/dnat.rst

@@ -0,0 +1,13 @@
+otcextensions.sdk.nat.v2.dnat
+=============================
+
+.. automodule:: otcextensions.sdk.nat.v2.dnat
+
+The DNAT Rule Class
+--------------------
+
+The ``Dnat`` class inherits from
+:class:`~otcextensions.sdk.sdk_resource.Resource`.
+
+.. autoclass:: otcextensions.sdk.nat.v2.dnat.Dnat
+   :members:

doc/source/sdk/resources/nat/v2/gateway.rst

@@ -0,0 +1,13 @@
+otcextensions.sdk.nat.v2.gateway
+================================
+
+.. automodule:: otcextensions.sdk.nat.v2.gateway
+
+The NAT Gateway Class
+----------------------
+
+The ``Gateway`` class inherits from
+:class:`~otcextensions.sdk.sdk_resource.Resource`.
+
+.. autoclass:: otcextensions.sdk.nat.v2.gateway.Gateway
+   :members:

doc/source/sdk/resources/nat/v2/snat.rst

@@ -0,0 +1,13 @@
+otcextensions.sdk.nat.v2.snat
+=============================
+
+.. automodule:: otcextensions.sdk.nat.v2.snat
+
+The SNAT Rule Class
+--------------------
+
+The ``Snat`` class inherits from
+:class:`~otcextensions.sdk.sdk_resource.Resource`.
+
+.. autoclass:: otcextensions.sdk.nat.v2.snat.Snat
+   :members:

otcextensions/osclient/nat/client.py

@@ -0,0 +1,53 @@
+#   Licensed under the Apache License, Version 2.0 (the "License"); you may
+#   not use this file except in compliance with the License. You may obtain
+#   a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#   License for the specific language governing permissions and limitations
+#   under the License.
+#
+import logging
+
+from osc_lib import utils
+
+from otcextensions import sdk
+from otcextensions.i18n import _
+
+LOG = logging.getLogger(__name__)
+
+DEFAULT_API_VERSION = '2'
+API_VERSION_OPTION = 'os_nat_api_version'
+API_NAME = "nat"
+API_VERSIONS = {
+    "2": "openstack.connection.Connection"
+}
+
+
+def make_client(instance):
+    """Returns a rds proxy"""
+
+    conn = instance.sdk_connection
+
+    if getattr(conn, 'nat', None) is None:
+        LOG.debug('OTC extensions are not registered. Do that now')
+        sdk.register_otc_extensions(conn)
+
+    LOG.debug('NAT client initialized using OpenStack OTC SDK: %s',
+              conn.nat)
+    return conn.nat
+
+
+def build_option_parser(parser):
+    """Hook to add global options"""
+    parser.add_argument(
+        '--os-nat-api-version',
+        metavar='<nat-api-version>',
+        default=utils.env('OS_NAT_API_VERSION'),
+        help=_("NAT API version, default=%s "
+               "(Env: OS_NAT_API_VERSION)") % DEFAULT_API_VERSION
+    )
+    return parser