Skip to content

Commit ecb49a8

Browse files
author
fengyikai
committed
云服务器(kec)：返回参数增加PublicIp（弹性公网IP地址）
1 parent ead5754 commit ecb49a8

3 files changed

Lines changed: 120 additions & 12 deletions

File tree

‎ksyun/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@
1414
# limitations under the License.
1515

1616

17-
__version__ = '1.5.8.72'
17+
__version__ = '1.5.8.73'

‎ksyun/client/kec/v20160304/client.py‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,6 +2308,52 @@ def CopySnapshot(self, request):
23082308
raise KsyunSDKException(message=str(e))
23092309

23102310

2311+
def ExportImage(self, request):
2312+
"""创建导出镜像任务
2313+
:param request: Request instance for ExportImage.
2314+
:type request: :class:`ksyun.client.kec.v20160304.models.ExportImageRequest`
2315+
"""
2316+
try:
2317+
params = request._serialize()
2318+
body = self.call_judge("ExportImage", params, "application/x-www-form-urlencoded")
2319+
response = json.loads(body)
2320+
if "Error" not in response:
2321+
return body
2322+
else:
2323+
code = response["Error"]["Code"]
2324+
message = response["Error"]["Message"]
2325+
req_id = response["RequestId"]
2326+
raise KsyunSDKException(code, message, req_id)
2327+
except Exception as e:
2328+
if isinstance(e, KsyunSDKException):
2329+
raise
2330+
else:
2331+
raise KsyunSDKException(message=str(e))
2332+
2333+
2334+
def CancelImageExport(self, request):
2335+
"""取消导出镜像任务
2336+
:param request: Request instance for CancelImageExport.
2337+
:type request: :class:`ksyun.client.kec.v20160304.models.CancelImageExportRequest`
2338+
"""
2339+
try:
2340+
params = request._serialize()
2341+
body = self.call_judge("CancelImageExport", params, "application/x-www-form-urlencoded")
2342+
response = json.loads(body)
2343+
if "Error" not in response:
2344+
return body
2345+
else:
2346+
code = response["Error"]["Code"]
2347+
message = response["Error"]["Message"]
2348+
req_id = response["RequestId"]
2349+
raise KsyunSDKException(code, message, req_id)
2350+
except Exception as e:
2351+
if isinstance(e, KsyunSDKException):
2352+
raise
2353+
else:
2354+
raise KsyunSDKException(message=str(e))
2355+
2356+
23112357
def PreMigrateInstance(self, request):
23122358
"""创建预迁移
23132359
:param request: Request instance for PreMigrateInstance.
@@ -2422,6 +2468,7 @@ def DescribeInstanceVncUrl(self, request):
24222468
else:
24232469
raise KsyunSDKException(message=str(e))
24242470

2471+
24252472
def CreateSnapshot(self, request):
24262473
"""创建文件系统快照
24272474
:param request: Request instance for CreateSnapshot.
@@ -2444,6 +2491,7 @@ def CreateSnapshot(self, request):
24442491
else:
24452492
raise KsyunSDKException(message=str(e))
24462493

2494+
24472495
def UpdateSnapshot(self, request):
24482496
"""修改文件系统快照
24492497
:param request: Request instance for UpdateSnapshot.
@@ -2466,6 +2514,7 @@ def UpdateSnapshot(self, request):
24662514
else:
24672515
raise KsyunSDKException(message=str(e))
24682516

2517+
24692518
def DeleteSnapshot(self, request):
24702519
"""删除文件系统快照
24712520
:param request: Request instance for DeleteSnapshot.
@@ -2488,6 +2537,7 @@ def DeleteSnapshot(self, request):
24882537
else:
24892538
raise KsyunSDKException(message=str(e))
24902539

2540+
24912541
def RevertSnapshot(self, request):
24922542
"""文件系统快照回滚
24932543
:param request: Request instance for RevertSnapshot.
@@ -2510,6 +2560,7 @@ def RevertSnapshot(self, request):
25102560
else:
25112561
raise KsyunSDKException(message=str(e))
25122562

2563+
25132564
def DescribeSnapshotList(self, request):
25142565
"""查询文件系统的快照信息
25152566
:param request: Request instance for DescribeSnapshotList.
@@ -2532,6 +2583,7 @@ def DescribeSnapshotList(self, request):
25322583
else:
25332584
raise KsyunSDKException(message=str(e))
25342585

2586+
25352587
def CreateSnapshotPolicy(self, request):
25362588
"""创建文件系统自动快照策略
25372589
:param request: Request instance for CreateSnapshotPolicy.
@@ -2554,6 +2606,7 @@ def CreateSnapshotPolicy(self, request):
25542606
else:
25552607
raise KsyunSDKException(message=str(e))
25562608

2609+
25572610
def UpdateSnapshotPolicy(self, request):
25582611
"""修改文件系统自动快照策略
25592612
:param request: Request instance for UpdateSnapshotPolicy.
@@ -2576,6 +2629,7 @@ def UpdateSnapshotPolicy(self, request):
25762629
else:
25772630
raise KsyunSDKException(message=str(e))
25782631

2632+
25792633
def DeleteSnapshotPolicy(self, request):
25802634
"""删除文件系统自动快照策略
25812635
:param request: Request instance for DeleteSnapshotPolicy.
@@ -2598,6 +2652,7 @@ def DeleteSnapshotPolicy(self, request):
25982652
else:
25992653
raise KsyunSDKException(message=str(e))
26002654

2655+
26012656
def ApplySnapshotPolicy(self, request):
26022657
"""文件系统关联自动快照策略
26032658
:param request: Request instance for ApplySnapshotPolicy.
@@ -2620,6 +2675,7 @@ def ApplySnapshotPolicy(self, request):
26202675
else:
26212676
raise KsyunSDKException(message=str(e))
26222677

2678+
26232679
def CancelSnapshotPolicy(self, request):
26242680
"""文件系统移除自动快照策略
26252681
:param request: Request instance for CancelSnapshotPolicy.
@@ -2642,6 +2698,7 @@ def CancelSnapshotPolicy(self, request):
26422698
else:
26432699
raise KsyunSDKException(message=str(e))
26442700

2701+
26452702
def DescribeSnapshotPolicyList(self, request):
26462703
"""获取文件系统自动快照策略列表
26472704
:param request: Request instance for DescribeSnapshotPolicyList.
@@ -2664,6 +2721,7 @@ def DescribeSnapshotPolicyList(self, request):
26642721
else:
26652722
raise KsyunSDKException(message=str(e))
26662723

2724+
26672725
def ModifyRecycleBinAttribute(self, request):
26682726
"""修改回收站信息
26692727
:param request: Request instance for ModifyRecycleBinAttribute.
@@ -2686,6 +2744,7 @@ def ModifyRecycleBinAttribute(self, request):
26862744
else:
26872745
raise KsyunSDKException(message=str(e))
26882746

2747+
26892748
def DescribeAccessGroups(self, request):
26902749
"""查询权限组信息
26912750
:param request: Request instance for DescribeAccessGroups.
@@ -2708,6 +2767,7 @@ def DescribeAccessGroups(self, request):
27082767
else:
27092768
raise KsyunSDKException(message=str(e))
27102769

2770+
27112771
def CreateAccessGroup(self, request):
27122772
"""创建权限组
27132773
:param request: Request instance for CreateAccessGroup.
@@ -2730,6 +2790,7 @@ def CreateAccessGroup(self, request):
27302790
else:
27312791
raise KsyunSDKException(message=str(e))
27322792

2793+
27332794
def ModifyAccessGroup(self, request):
27342795
"""修改权限组
27352796
:param request: Request instance for ModifyAccessGroup.
@@ -2752,6 +2813,7 @@ def ModifyAccessGroup(self, request):
27522813
else:
27532814
raise KsyunSDKException(message=str(e))
27542815

2816+
27552817
def DeleteAccessGroup(self, request):
27562818
"""删除权限组
27572819
:param request: Request instance for DeleteAccessGroup.
@@ -2774,6 +2836,7 @@ def DeleteAccessGroup(self, request):
27742836
else:
27752837
raise KsyunSDKException(message=str(e))
27762838

2839+
27772840
def DescribeAccessRules(self, request):
27782841
"""查询权限组规则列表
27792842
:param request: Request instance for DescribeAccessRules.
@@ -2796,6 +2859,7 @@ def DescribeAccessRules(self, request):
27962859
else:
27972860
raise KsyunSDKException(message=str(e))
27982861

2862+
27992863
def CreateAccessRule(self, request):
28002864
"""创建权限组规则
28012865
:param request: Request instance for CreateAccessRule.
@@ -2818,6 +2882,7 @@ def CreateAccessRule(self, request):
28182882
else:
28192883
raise KsyunSDKException(message=str(e))
28202884

2885+
28212886
def ModifyAccessRule(self, request):
28222887
"""修改权限组规则
28232888
:param request: Request instance for ModifyAccessRule.
@@ -2840,6 +2905,7 @@ def ModifyAccessRule(self, request):
28402905
else:
28412906
raise KsyunSDKException(message=str(e))
28422907

2908+
28432909
def DeleteAccessRule(self, request):
28442910
"""删除权限组规则
28452911
:param request: Request instance for DeleteAccessRule.
@@ -2862,6 +2928,7 @@ def DeleteAccessRule(self, request):
28622928
else:
28632929
raise KsyunSDKException(message=str(e))
28642930

2931+
28652932
def ModifyMountTarget(self, request):
28662933
"""修改文件系统挂载点
28672934
:param request: Request instance for ModifyMountTarget.
@@ -2883,3 +2950,5 @@ def ModifyMountTarget(self, request):
28832950
raise
28842951
else:
28852952
raise KsyunSDKException(message=str(e))
2953+
2954+

‎ksyun/client/kec/v20160304/models.py‎

Lines changed: 50 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def __init__(self):
8282
:type PathPrefix: String
8383
:param PurchaseTime: 购买时长，单位月
8484
:type PathPrefix: Int
85-
:param SecurityGroupId: 实例绑定的安全组，目前仅支持绑定一个安全组
85+
:param SecurityGroupId: 实例绑定的安全组
8686
:type PathPrefix: Filter
8787
:param PrivateIpAddress: 私有IP地址，指定子网IP地址范围内的任意有效值，代表实例的主IP地址，只能选择一个，绑定到主网卡；如果未指定该参数，系统自动从有效地址池中随机选取一个
8888
:type PathPrefix: String
@@ -583,10 +583,6 @@ def __init__(self):
583583
:type PathPrefix: Boolean
584584
:param SystemDisk.DiskType: 不能给默认值，不传默认按价格体系配置systemDisk属性中第一个创建
585585
:type PathPrefix: String
586-
:param SystemDisk.ResizeType: 扩容 offline 离线扩容| online 在线扩容
587-
:type PathPrefix: String
588-
:param UserData: 用户自定义数据，必须是base64编码
589-
:type PathPrefix: String
590586
"""
591587
self.InstanceId = None
592588
self.ImageId = None
@@ -595,8 +591,6 @@ def __init__(self):
595591
self.KeyId = None
596592
self.KeepImageLogin = None
597593
self.SystemDisk_DiskType = None
598-
self.SystemDisk_ResizeType = None
599-
self.UserData = None
600594

601595
def _deserialize(self, params):
602596
if params.get("InstanceId"):
@@ -613,10 +607,6 @@ def _deserialize(self, params):
613607
self.KeepImageLogin = params.get("KeepImageLogin")
614608
if params.get("SystemDisk.DiskType"):
615609
self.SystemDisk_DiskType = params.get("SystemDisk.DiskType")
616-
if params.get("SystemDisk.ResizeType"):
617-
self.SystemDisk_ResizeType = params.get("SystemDisk.ResizeType")
618-
if params.get("UserData"):
619-
self.UserData = params.get("UserData")
620610

621611

622612
class CreateImageRequest(AbstractModel):
@@ -3632,6 +3622,53 @@ def _deserialize(self, params):
36323622
self.DestinationSnapshotDesc = params.get("DestinationSnapshotDesc")
36333623

36343624

3625+
class ExportImageRequest(AbstractModel):
3626+
"""ExportImage请求参数结构体
3627+
"""
3628+
3629+
def __init__(self):
3630+
r"""创建导出镜像任务
3631+
:param ImageId: 自定义镜像ID
3632+
:type PathPrefix: String
3633+
:param Ks3Bucket: 镜像导出的目标bucket地址（需与镜像同地域，否则报错）
3634+
:type PathPrefix: String
3635+
:param ObjectName: 镜像导出后的文件名前缀，有效值：1-30个字符，支持文字、数字
3636+
:type PathPrefix: String
3637+
:param ImageExportType: 镜像文件的导出格式，有效值：RAW、VHD、QCOW2、VDI和VMDK。未填，则默认为RAW
3638+
:type PathPrefix: String
3639+
"""
3640+
self.ImageId = None
3641+
self.Ks3Bucket = None
3642+
self.ObjectName = None
3643+
self.ImageExportType = None
3644+
3645+
def _deserialize(self, params):
3646+
if params.get("ImageId"):
3647+
self.ImageId = params.get("ImageId")
3648+
if params.get("Ks3Bucket"):
3649+
self.Ks3Bucket = params.get("Ks3Bucket")
3650+
if params.get("ObjectName"):
3651+
self.ObjectName = params.get("ObjectName")
3652+
if params.get("ImageExportType"):
3653+
self.ImageExportType = params.get("ImageExportType")
3654+
3655+
3656+
class CancelImageExportRequest(AbstractModel):
3657+
"""CancelImageExport请求参数结构体
3658+
"""
3659+
3660+
def __init__(self):
3661+
r"""取消导出镜像任务
3662+
:param ImageId: 正在导出的镜像ID
3663+
:type PathPrefix: String
3664+
"""
3665+
self.ImageId = None
3666+
3667+
def _deserialize(self, params):
3668+
if params.get("ImageId"):
3669+
self.ImageId = params.get("ImageId")
3670+
3671+
36353672
class PreMigrateInstanceRequest(AbstractModel):
36363673
"""PreMigrateInstance请求参数结构体
36373674
"""
@@ -4389,3 +4426,5 @@ def _deserialize(self, params):
43894426
self.MountTargetId = params.get("MountTargetId")
43904427
if params.get("AccessGroupId"):
43914428
self.AccessGroupId = params.get("AccessGroupId")
4429+
4430+

0 commit comments

Comments
 (0)