fix eip typo and object schema (#6)

BUGFIX:

- Fix the typo of automatic generating (such as `eip`, `vip`), and compatible with the old version (#6)
- Fix object schema class to object (such as `unet` schema) (#6)

Author: yufeiminds

docs/quick_start.rst

@@ -53,7 +53,7 @@ You can then use your keys to create a new client of uhost service:
                 'Type': 'CLOUD_SSD'
             }],
         })
-    except exc.UCloudException as e
+    except exc.UCloudException as e:
         print(e)
     else:
         print(resp)

docs/services.rst

@@ -1,16 +1,22 @@
 UCloud SDK Services
 ===================
 
-ULB
----
+PathX
+-----
 
-.. autoclass:: ucloud.services.ulb.client.ULBClient
+.. autoclass:: ucloud.services.pathx.client.PathXClient
    :members:
 
-UNet
-----
+UAccount
+--------
 
-.. autoclass:: ucloud.services.unet.client.UNetClient
+.. autoclass:: ucloud.services.uaccount.client.UAccountClient
+   :members:
+
+UDB
+---
+
+.. autoclass:: ucloud.services.udb.client.UDBClient
    :members:
 
 UDPN
@@ -25,22 +31,16 @@ UDisk
 .. autoclass:: ucloud.services.udisk.client.UDiskClient
    :members:
 
-UDB
----
-
-.. autoclass:: ucloud.services.udb.client.UDBClient
-   :members:
-
-UPHost
-------
+UHost
+-----
 
-.. autoclass:: ucloud.services.uphost.client.UPHostClient
+.. autoclass:: ucloud.services.uhost.client.UHostClient
    :members:
 
-UAccount
---------
+ULB
+---
 
-.. autoclass:: ucloud.services.uaccount.client.UAccountClient
+.. autoclass:: ucloud.services.ulb.client.ULBClient
    :members:
 
 UMem
@@ -49,21 +49,21 @@ UMem
 .. autoclass:: ucloud.services.umem.client.UMemClient
    :members:
 
-VPC
----
+UNet
+----
 
-.. autoclass:: ucloud.services.vpc.client.VPCClient
+.. autoclass:: ucloud.services.unet.client.UNetClient
    :members:
 
-UHost
------
+UPHost
+------
 
-.. autoclass:: ucloud.services.uhost.client.UHostClient
+.. autoclass:: ucloud.services.uphost.client.UPHostClient
    :members:
 
-PathX
------
+VPC
+---
 
-.. autoclass:: ucloud.services.pathx.client.PathXClient
+.. autoclass:: ucloud.services.vpc.client.VPCClient
    :members:
 

examples/uhost/main.py

@@ -37,7 +37,7 @@ def main():
         'Memory': 1024,
         'Disks': [{
             'Size': image["ImageSize"],
-            'Type': 'CLOUD_NORMAL',
+            'Type': 'LOCAL_NORMAL',
             'IsBoot': 'True',
         }],
     })

ucloud/client.py

@@ -1,3 +1,5 @@
+""" Code is generated by ucloud-model, DO NOT EDIT IT. """
+
 from ucloud.core import client
 
 
@@ -6,15 +8,10 @@ def __init__(self, config: dict, transport=None, middleware=None):
         self._config = config
         super(Client, self).__init__(config, transport, middleware)
 
-    def umem(self):
-        from ucloud.services.umem.client import UMemClient
-
-        return UMemClient(self._config, self.transport, self.middleware, self.logger)
-
-    def unet(self):
-        from ucloud.services.unet.client import UNetClient
+    def pathx(self):
+        from ucloud.services.pathx.client import PathXClient
 
-        return UNetClient(self._config, self.transport, self.middleware, self.logger)
+        return PathXClient(self._config, self.transport, self.middleware, self.logger)
 
     def uaccount(self):
         from ucloud.services.uaccount.client import UAccountClient
@@ -23,25 +20,40 @@ def uaccount(self):
             self._config, self.transport, self.middleware, self.logger
         )
 
-    def udisk(self):
-        from ucloud.services.udisk.client import UDiskClient
+    def udb(self):
+        from ucloud.services.udb.client import UDBClient
 
-        return UDiskClient(self._config, self.transport, self.middleware, self.logger)
+        return UDBClient(self._config, self.transport, self.middleware, self.logger)
 
     def udpn(self):
         from ucloud.services.udpn.client import UDPNClient
 
         return UDPNClient(self._config, self.transport, self.middleware, self.logger)
 
+    def udisk(self):
+        from ucloud.services.udisk.client import UDiskClient
+
+        return UDiskClient(self._config, self.transport, self.middleware, self.logger)
+
     def uhost(self):
         from ucloud.services.uhost.client import UHostClient
 
         return UHostClient(self._config, self.transport, self.middleware, self.logger)
 
-    def pathx(self):
-        from ucloud.services.pathx.client import PathXClient
+    def ulb(self):
+        from ucloud.services.ulb.client import ULBClient
 
-        return PathXClient(self._config, self.transport, self.middleware, self.logger)
+        return ULBClient(self._config, self.transport, self.middleware, self.logger)
+
+    def umem(self):
+        from ucloud.services.umem.client import UMemClient
+
+        return UMemClient(self._config, self.transport, self.middleware, self.logger)
+
+    def unet(self):
+        from ucloud.services.unet.client import UNetClient
+
+        return UNetClient(self._config, self.transport, self.middleware, self.logger)
 
     def uphost(self):
         from ucloud.services.uphost.client import UPHostClient
@@ -52,13 +64,3 @@ def vpc(self):
         from ucloud.services.vpc.client import VPCClient
 
         return VPCClient(self._config, self.transport, self.middleware, self.logger)
-
-    def udb(self):
-        from ucloud.services.udb.client import UDBClient
-
-        return UDBClient(self._config, self.transport, self.middleware, self.logger)
-
-    def ulb(self):
-        from ucloud.services.ulb.client import ULBClient
-
-        return ULBClient(self._config, self.transport, self.middleware, self.logger)

ucloud/core/transport/_requests.py

@@ -63,8 +63,11 @@ def _send(self, req: Request, **options: dict) -> requests.Response:
             session.mount("https://", adapter=adapter)
 
             session_resp = session.request(
-                method=req.method.upper(), url=req.url,
-                json=req.json, data=req.data, params=req.params,
+                method=req.method.upper(),
+                url=req.url,
+                json=req.json,
+                data=req.data,
+                params=req.params,
                 headers=req.headers,
             )
             resp = self.convert_response(session_resp)

ucloud/services/pathx/client.py

@@ -1,3 +1,5 @@
+""" Code is generated by ucloud-model, DO NOT EDIT IT. """
+
 import typing
 
 
@@ -28,8 +30,8 @@ def create_global_ssh_instance(
         
         **Response**
 
-        - **InstanceId** (str) - 实例ID，资源唯一标识
         - **AcceleratingDomain** (str) - 加速域名，访问该域名可就近接入
+        - **InstanceId** (str) - 实例ID，资源唯一标识
         - **Message** (str) - 提示信息
         
         """
@@ -86,9 +88,9 @@ def describe_global_ssh_area(
         
         **GlobalSSHArea** 
         
+        - **Area** (str) - GlobalSSH覆盖的地区,如香港、东京、洛杉矶等
         - **AreaCode** (str) - 地区代号,以地区AirPort Code
         - **RegionSet** (list) - ucloud机房代号构成的数组，如["hk","us-ca"]
-        - **Area** (str) - GlobalSSH覆盖的地区,如香港、东京、洛杉矶等
 
         """
         # build request
@@ -117,15 +119,15 @@ def describe_global_ssh_instance(
         
         **GlobalSSHInfo** 
         
-        - **TargetIP** (str) - 被SSH访问的EIP
-        - **Port** (int) - SSH登陆端口
-        - **ChargeType** (str) - 支付周期，如Month,Year等
         - **AcceleratingDomain** (str) - 加速域名
         - **Area** (str) - 被SSH访问的IP所在地区
-        - **Remark** (str) - 备注信息
+        - **ChargeType** (str) - 支付周期，如Month,Year等
         - **CreateTime** (int) - 资源创建时间戳
         - **ExpireTime** (int) - 资源过期时间戳
         - **InstanceId** (str) - 实例ID，资源唯一标识
+        - **Port** (int) - SSH登陆端口
+        - **Remark** (str) - 备注信息
+        - **TargetIP** (str) - 被SSH访问的EIP
 
         """
         # build request

ucloud/services/pathx/schemas/apis.py

@@ -1,3 +1,5 @@
+""" Code is generated by ucloud-model, DO NOT EDIT IT. """
+
 from ucloud.core.typesystem import schema, fields
 from ucloud.services.pathx.schemas import models
 
@@ -18,15 +20,15 @@ class CreateGlobalSSHInstanceRequestSchema(schema.RequestSchema):
     """
 
     fields = {
-        "Quantity": fields.Int(required=False, dump_to="Quantity"),
+        "Area": fields.Str(required=True, dump_to="Area"),
+        "AreaCode": fields.Str(required=True, dump_to="AreaCode"),
+        "ChargeType": fields.Str(required=False, dump_to="ChargeType"),
         "CouponId": fields.Str(required=False, dump_to="CouponId"),
-        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "Port": fields.Int(required=True, dump_to="Port"),
-        "AreaCode": fields.Str(required=True, dump_to="AreaCode"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
+        "Quantity": fields.Int(required=False, dump_to="Quantity"),
         "Remark": fields.Str(required=False, dump_to="Remark"),
-        "Area": fields.Str(required=True, dump_to="Area"),
         "TargetIP": fields.Str(required=True, dump_to="TargetIP"),
-        "ChargeType": fields.Str(required=False, dump_to="ChargeType"),
     }
 
 
@@ -35,10 +37,10 @@ class CreateGlobalSSHInstanceResponseSchema(schema.ResponseSchema):
     """
 
     fields = {
-        "InstanceId": fields.Str(required=True, load_from="InstanceId"),
         "AcceleratingDomain": fields.Str(
             required=False, load_from="AcceleratingDomain"
         ),
+        "InstanceId": fields.Str(required=True, load_from="InstanceId"),
         "Message": fields.Str(required=False, load_from="Message"),
     }
 
@@ -55,8 +57,8 @@ class DeleteGlobalSSHInstanceRequestSchema(schema.RequestSchema):
     """
 
     fields = {
-        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "InstanceId": fields.Str(required=True, dump_to="InstanceId"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
     }
 
 
@@ -79,8 +81,8 @@ class DescribeGlobalSSHAreaRequestSchema(schema.RequestSchema):
     """
 
     fields = {
-        "Region": fields.Str(required=False, dump_to="Region"),
         "ProjectId": fields.Str(required=False, dump_to="ProjectId"),
+        "Region": fields.Str(required=False, dump_to="Region"),
     }
 
 
@@ -108,8 +110,8 @@ class DescribeGlobalSSHInstanceRequestSchema(schema.RequestSchema):
     """
 
     fields = {
-        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "InstanceId": fields.Str(required=False, dump_to="InstanceId"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
     }
 
 
@@ -136,9 +138,9 @@ class ModifyGlobalSSHPortRequestSchema(schema.RequestSchema):
     """
 
     fields = {
-        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "InstanceId": fields.Str(required=True, dump_to="InstanceId"),
         "Port": fields.Int(required=True, dump_to="Port"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
     }
 
 
@@ -161,8 +163,8 @@ class ModifyGlobalSSHRemarkRequestSchema(schema.RequestSchema):
     """
 
     fields = {
-        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "InstanceId": fields.Str(required=True, dump_to="InstanceId"),
+        "ProjectId": fields.Str(required=True, dump_to="ProjectId"),
         "Remark": fields.Str(required=False, dump_to="Remark"),
     }
 

ucloud/services/pathx/schemas/models.py

@@ -1,3 +1,5 @@
+""" Code is generated by ucloud-model, DO NOT EDIT IT. """
+
 from ucloud.core.typesystem import schema, fields
 
 
@@ -17,13 +19,13 @@ class GlobalSSHInfoSchema(schema.ResponseSchema):
     """
 
     fields = {
-        "Port": fields.Int(required=True, load_from="Port"),
+        "AcceleratingDomain": fields.Str(required=True, load_from="AcceleratingDomain"),
+        "Area": fields.Str(required=True, load_from="Area"),
         "ChargeType": fields.Str(required=True, load_from="ChargeType"),
         "CreateTime": fields.Int(required=True, load_from="CreateTime"),
         "ExpireTime": fields.Int(required=True, load_from="ExpireTime"),
         "InstanceId": fields.Str(required=True, load_from="InstanceId"),
-        "AcceleratingDomain": fields.Str(required=True, load_from="AcceleratingDomain"),
-        "Area": fields.Str(required=True, load_from="Area"),
-        "TargetIP": fields.Str(required=True, load_from="TargetIP"),
+        "Port": fields.Int(required=True, load_from="Port"),
         "Remark": fields.Str(required=True, load_from="Remark"),
+        "TargetIP": fields.Str(required=True, load_from="TargetIP"),
     }