publish jdcloud-cli 1.2.0 (#49)

* publish jdcloud-cli 1.2.0

* Update pod.py

Author: 欧林宝

jdcloud_cli/client_factory.py

@@ -21,16 +21,16 @@
 from jdcloud_sdk.services.rds.client.RdsClient import RdsClient
 from jdcloud_sdk.services.kubernetes.client.KubernetesClient import KubernetesClient
 from jdcloud_sdk.services.streamcomputer.client.StreamcomputerClient import StreamcomputerClient
+from jdcloud_sdk.services.ssl.client.SslClient import SslClient
 from jdcloud_sdk.services.ipanti.client.IpantiClient import IpantiClient
 from jdcloud_sdk.services.oss.client.OssClient import OssClient
 from jdcloud_sdk.services.redis.client.RedisClient import RedisClient
+from jdcloud_sdk.services.domainservice.client.DomainserviceClient import DomainserviceClient
 from jdcloud_sdk.services.deploy.client.DeployClient import DeployClient
 from jdcloud_sdk.services.sop.client.SopClient import SopClient
 from jdcloud_sdk.services.function.client.FunctionClient import FunctionClient
 from jdcloud_sdk.services.portal.client.PortalClient import PortalClient
 from jdcloud_sdk.services.clouddnsservice.client.ClouddnsserviceClient import ClouddnsserviceClient
-from jdcloud_sdk.services.cps.client.CpsClient import CpsClient
-from jdcloud_sdk.services.cdn.client.CdnClient import CdnClient
 from jdcloud_sdk.services.streambus.client.StreambusClient import StreambusClient
 from jdcloud_sdk.services.httpdns.client.HttpdnsClient import HttpdnsClient
 from jdcloud_sdk.services.mps.client.MpsClient import MpsClient
@@ -41,21 +41,28 @@
 from jdcloud_sdk.services.ams.client.AmsClient import AmsClient
 from jdcloud_sdk.services.jdro.client.JdroClient import JdroClient
 from jdcloud_sdk.services.zfs.client.ZfsClient import ZfsClient
+from jdcloud_sdk.services.vod.client.VodClient import VodClient
+from jdcloud_sdk.services.yundingdatapush.client.YundingdatapushClient import YundingdatapushClient
 from jdcloud_sdk.services.datastar.client.DatastarClient import DatastarClient
 from jdcloud_sdk.services.kms.client.KmsClient import KmsClient
 from jdcloud_sdk.services.elite.client.EliteClient import EliteClient
+from jdcloud_sdk.services.ossopenapi.client.OssopenapiClient import OssopenapiClient
 from jdcloud_sdk.services.iam.client.IamClient import IamClient
 from jdcloud_sdk.services.iothub.client.IothubClient import IothubClient
+from jdcloud_sdk.services.sms.client.SmsClient import SmsClient
 from jdcloud_sdk.services.jcq.client.JcqClient import JcqClient
 from jdcloud_sdk.services.baseanti.client.BaseantiClient import BaseantiClient
 from jdcloud_sdk.services.ias.client.IasClient import IasClient
 from jdcloud_sdk.services.mongodb.client.MongodbClient import MongodbClient
 from jdcloud_sdk.services.live.client.LiveClient import LiveClient
 from jdcloud_sdk.services.jdfusion.client.JdfusionClient import JdfusionClient
+from jdcloud_sdk.services.renewal.client.RenewalClient import RenewalClient
 from jdcloud_sdk.services.vpc.client.VpcClient import VpcClient
 from jdcloud_sdk.services.monitor.client.MonitorClient import MonitorClient
 from jdcloud_sdk.services.xdata.client.XdataClient import XdataClient
 from jdcloud_sdk.services.cr.client.CrClient import CrClient
+from jdcloud_sdk.services.partner.client.PartnerClient import PartnerClient
+from jdcloud_sdk.services.industrydata.client.IndustrydataClient import IndustrydataClient
 from jdcloud_cli.config import ProfileManager
 from jdcloud_cli.logger import get_logger
 
@@ -70,16 +77,16 @@ def get(self, app):
             'rds': RdsClient,
             'kubernetes': KubernetesClient,
             'streamcomputer': StreamcomputerClient,
+            'ssl': SslClient,
             'ipanti': IpantiClient,
             'oss': OssClient,
             'redis': RedisClient,
+            'domainservice': DomainserviceClient,
             'deploy': DeployClient,
             'sop': SopClient,
             'function': FunctionClient,
             'portal': PortalClient,
             'clouddnsservice': ClouddnsserviceClient,
-            'cps': CpsClient,
-            'cdn': CdnClient,
             'streambus': StreambusClient,
             'httpdns': HttpdnsClient,
             'mps': MpsClient,
@@ -90,21 +97,28 @@ def get(self, app):
             'ams': AmsClient,
             'jdro': JdroClient,
             'zfs': ZfsClient,
+            'vod': VodClient,
+            'yundingdatapush': YundingdatapushClient,
             'datastar': DatastarClient,
             'kms': KmsClient,
             'elite': EliteClient,
+            'ossopenapi': OssopenapiClient,
             'iam': IamClient,
             'iothub': IothubClient,
+            'sms': SmsClient,
             'jcq': JcqClient,
             'baseanti': BaseantiClient,
             'ias': IasClient,
             'mongodb': MongodbClient,
             'live': LiveClient,
             'jdfusion': JdfusionClient,
+            'renewal': RenewalClient,
             'vpc': VpcClient,
             'monitor': MonitorClient,
             'xdata': XdataClient,
             'cr': CrClient,
+            'partner': PartnerClient,
+            'industrydata': IndustrydataClient,
         }
 
         profile_manager = ProfileManager()

jdcloud_cli/controllers/services/baseanti.py

@@ -182,9 +182,9 @@ def describe_ip_monitor_flow(self):
             (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
         ],
         formatter_class=RawTextHelpFormatter,
-        help=''' 查询公网 IP 的安全信息列表. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外), 云物理服务器的公网 IP 和弹性公网 IP. (已废弃, 建议使用 <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describeelasticipresources">describeElasticIpResources</a>, <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describecpsipresources">describeCpsIpResources</a> 接口)";  ''',
+        help=''' 查询基础防护已防护的公网 IP 的安全信息列表. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外), 云物理服务器的公网 IP 和弹性公网 IP. (已废弃, 建议使用 <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describeelasticipresources">describeElasticIpResources</a>, <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describecpsipresources">describeCpsIpResources</a> 接口)";  ''',
         description='''
-            查询公网 IP 的安全信息列表. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外), 云物理服务器的公网 IP 和弹性公网 IP. (已废弃, 建议使用 <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describeelasticipresources">describeElasticIpResources</a>, <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describecpsipresources">describeCpsIpResources</a> 接口)"; 。
+            查询基础防护已防护的公网 IP 的安全信息列表. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外), 云物理服务器的公网 IP 和弹性公网 IP. (已废弃, 建议使用 <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describeelasticipresources">describeElasticIpResources</a>, <a href="http://docs.jdcloud.com/anti-ddos-basic/api/describecpsipresources">describeCpsIpResources</a> 接口)"; 。
 
             示例: jdc baseanti describe-ip-resources 
         ''',
@@ -216,9 +216,9 @@ def describe_ip_resources(self):
             (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
         ],
         formatter_class=RawTextHelpFormatter,
-        help=''' 查询私有网络的弹性公网 IP 的安全信息. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外);  ''',
+        help=''' 查询基础防护已防护的私有网络的弹性公网 IP 的安全信息. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外);  ''',
         description='''
-            查询私有网络的弹性公网 IP 的安全信息. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外); 。
+            查询基础防护已防护的私有网络的弹性公网 IP 的安全信息. 包括私有网络的弹性公网 IP(运营商级 NAT 保留地址除外); 。
 
             示例: jdc baseanti describe-elastic-ip-resources 
         ''',
@@ -250,9 +250,9 @@ def describe_elastic_ip_resources(self):
             (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
         ],
         formatter_class=RawTextHelpFormatter,
-        help=''' 查询云物理服务器公网 IP 的安全信息. 包括云物理服务器的公网 IP 和弹性公网 IP.;  ''',
+        help=''' 查询基础防护已防护的云物理服务器公网 IP 的安全信息. 包括云物理服务器的公网 IP 和弹性公网 IP.;  ''',
         description='''
-            查询云物理服务器公网 IP 的安全信息. 包括云物理服务器的公网 IP 和弹性公网 IP.; 。
+            查询基础防护已防护的云物理服务器公网 IP 的安全信息. 包括云物理服务器的公网 IP 和弹性公网 IP.; 。
 
             示例: jdc baseanti describe-cps-ip-resources 
         ''',
@@ -275,6 +275,40 @@ def describe_cps_ip_resources(self):
         except Exception as e:
             print(e)
 
+    @expose(
+        arguments=[
+            (['--region-id'], dict(help="""(string) 地域编码. 基础防护已支持华北-北京, 华东-宿迁, 华东-上海, 华南-广州;  """, dest='regionId',  required=False)),
+            (['--page-number'], dict(help="""(int) 页码 """, dest='pageNumber', type=int, required=False)),
+            (['--page-size'], dict(help="""(int) 分页大小 """, dest='pageSize', type=int, required=False)),
+            (['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
+            (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
+        ],
+        formatter_class=RawTextHelpFormatter,
+        help=''' 查询基础防护已防护的托管区 IP 的安全信息 ''',
+        description='''
+            查询基础防护已防护的托管区 IP 的安全信息。
+
+            示例: jdc baseanti describe-ccs-ip-resources 
+        ''',
+    )
+    def describe_ccs_ip_resources(self):
+        client_factory = ClientFactory('baseanti')
+        client = client_factory.get(self.app)
+        if client is None:
+            return
+
+        try:
+            from jdcloud_sdk.services.baseanti.apis.DescribeCcsIpResourcesRequest import DescribeCcsIpResourcesRequest
+            params_dict = collect_user_args(self.app)
+            headers = collect_user_headers(self.app)
+            req = DescribeCcsIpResourcesRequest(params_dict, headers)
+            resp = client.send(req)
+            Printer.print_result(resp)
+        except ImportError:
+            print('{"error":"This api is not supported, please use the newer version"}')
+        except Exception as e:
+            print(e)
+
     @expose(
         arguments=[
             (['--region-id'], dict(help="""(string) 地域编码. 基础防护已支持华北-北京, 华东-宿迁, 华东-上海, 华南-广州;  """, dest='regionId',  required=False)),
@@ -512,7 +546,7 @@ def describe_ip_resource_flow(self):
 
     @expose(
         arguments=[
-            (['--api'], dict(help="""(string) api name """, choices=['describe-attack-logs','describe-attack-statistics','describe-attack-type-count','describe-ip-monitor-flow','describe-ip-resources','describe-elastic-ip-resources','describe-cps-ip-resources','describe-ip-resource-info','describe-ip-safety-info','set-clean-threshold','set-ip-clean-threshold','describe-ip-clean-threshold-range','describe-ip-resource-protect-info','describe-ip-resource-flow',], required=True)),
+            (['--api'], dict(help="""(string) api name """, choices=['describe-attack-logs','describe-attack-statistics','describe-attack-type-count','describe-ip-monitor-flow','describe-ip-resources','describe-elastic-ip-resources','describe-cps-ip-resources','describe-ccs-ip-resources','describe-ip-resource-info','describe-ip-safety-info','set-clean-threshold','set-ip-clean-threshold','describe-ip-clean-threshold-range','describe-ip-resource-protect-info','describe-ip-resource-flow',], required=True)),
         ],
         formatter_class=RawTextHelpFormatter,
         help=''' 生成单个API接口的json骨架空字符串 ''',

jdcloud_cli/controllers/services/disk.py

@@ -247,6 +247,7 @@ def restore_disk(self):
             (['--region-id'], dict(help="""(string) 地域ID """, dest='regionId',  required=False)),
             (['--disk-id'], dict(help="""(string) 云硬盘ID """, dest='diskId',  required=True)),
             (['--disk-size-gb'], dict(help="""(int) 扩容后的云硬盘大小，单位为GiB """, dest='diskSizeGB', type=int, required=True)),
+            (['--iops'], dict(help="""(int) 修改ssd.io1型云硬盘的iops数量，当且仅当ssd.io1型的云盘类型有效，步长是10. """, dest='iops', type=int, required=False)),
             (['--input-json'], dict(help='(json) 以json字符串或文件绝对路径形式作为输入参数。\n字符串方式举例：--input-json \'{"field":"value"}\';\n文件格式举例：--input-json file:///xxxx.json', dest='input_json', required=False)),
             (['--headers'], dict(help="""(json) 用户自定义Header，举例：'{"x-jdcloud-security-token":"abc","test":"123"}'""", dest='headers', required=False)),
         ],