Skip to content

Commit dae92be

Browse files
author
金山云SDK
authored
Merge pull request KscSDK#11 from KscSDK/trunk
merge Trunk into master
2 parents 04f77e8 + ebb7d1f commit dae92be

File tree

7 files changed

+402
-23
lines changed

7 files changed

+402
-23
lines changed

‎examples/network.py

100644100755
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,24 @@
2323
allInstances=kecClient.describe_instances()
2424
allEips=eipClient.describe_addresses(**{'Filter.1.Name':'instance-type','Filter.1.Value.1':'Slb'})
2525
allListeners=slbClient.describe_listeners(**{'Filter.1.Name':'load-balancer-id','Filter.1.Value.1':'5acac037-531c-414e-bb6f-c639c8948a57'})
26-
givenListeners=slbClient.describe_listeners(**{'ListenerId.1':'ca2717c8-9bc0-4955-a2f1-2b53b24301b9'})
27-
#slbClient.deregister_instances_from_listener(**{'RegisterId':'b74b0d7f-79f2-4601-980f-326804f22f42'})
26+
#slbClient.register_instances_with_listener(**{'ListenerId':'9b465945-5214-4038-8436-c1764b8298f5','RealServerIp':'10.0.0.2','RealServerPort':'80','RealServerType':'host'})
27+
givenListeners=slbClient.describe_listeners(**{'ListenerId.1':'9b465945-5214-4038-8436-c1764b8298f5'})
28+
prettyPrinter().pprint(givenListeners)
29+
#slbClient.deregister_instances_from_listener(**{'RegisterId':'cf0245b2-b847-462a-a777-7f680f6e48b8'})
2830

2931
#pprint.pprint(allEips)
3032

3133
#prettyPrinter().pprint(allVpcs)
3234
#prettyPrinter().pprint(allEips)
3335
#prettyPrinter().pprint(allNics)
34-
prettyPrinter().pprint(allInstances)
36+
#prettyPrinter().pprint(allInstances)
3537
for item in allEips['AddressesSet']:
3638
print item['PublicIp']
3739
print item['AllocationId']
38-
eipClient.associate_address(**{'AllocationId':'1cd0da05-8a3e-4c8e-8230-e6d39b85331e','InstanceType':'Ipfwd','InstanceId':'bede9a1c-d3a7-4b31-82e6-6699790ad1a3', 'NetworkInterfaceId':'fec81567-a4c7-4460-a998-54f407e77c0a'})
39-
eipClient.disassociate_address(**{'AllocationId':'1cd0da05-8a3e-4c8e-8230-e6d39b85331e'})
40+
#eipClient.associate_address(**{'AllocationId':'1cd0da05-8a3e-4c8e-8230-e6d39b85331e','InstanceType':'Ipfwd','InstanceId':'bede9a1c-d3a7-4b31-82e6-6699790ad1a3', 'NetworkInterfaceId':'fec81567-a4c7-4460-a998-54f407e77c0a'})
41+
#eipClient.disassociate_address(**{'AllocationId':'1cd0da05-8a3e-4c8e-8230-e6d39b85331e'})
4042
for item in allListeners['ListenerSet']:
4143
print item['ListenerName']
4244
print item['ListenerId']
43-
prettyPrinter().pprint(givenListeners)
4445
#availableIps=vpcClient.describe_subnet_available_addresses()
4546
#availableIps=vpcClient.describe_subnet_available_addresses(**{'Filter.1.Name':'subnet-id','Filter.1.Value.1':'0d238ac1-69b0-4602-893b-8da5862069e0'})

‎examples/offline.py

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# -*- encoding:utf-8 -*-
2+
from kscore.session import get_session
3+
import json
4+
5+
#初始化
6+
s = get_session()
7+
#注：参数不能改变
8+
client = s.create_client("offline", "cn-beijing-6", use_ssl=False)
9+
10+
#创建模板接口调用示例 : preset
11+
presetname = 'testpreset'
12+
description = 'just a demo'
13+
presetType = 'avop'
14+
15+
#具体的格式请参考官网说明
16+
param = {
17+
"preset": presetname,
18+
"description": description,
19+
"presettype": presetType,
20+
"param": {
21+
"f": "mp4",
22+
"AUDIO": {
23+
"acodec": "aac",
24+
"ar":"44100",
25+
"ab":"64k"
26+
},
27+
"VIDEO": {
28+
"vr": 25,
29+
"vb": "500k",
30+
"vcodec": "h264",
31+
"width": 640,
32+
"height": 360
33+
}
34+
}
35+
}
36+
37+
#该接口需要输入json格式数据，并且在参数前面加上"**"
38+
res = client.preset(**param)
39+
print json.dumps(res)
40+
41+
42+
#更新模板接口调用示例 : update_preset
43+
#该接口需要输入json格式数据，并且在参数前面加上"**"
44+
res = client.update_preset(**param)
45+
print json.dumps(res)
46+
47+
#获取模板列表接口调用示例 : get_preset_list
48+
res = client.get_preset_list()
49+
print json.dumps(res)
50+
51+
#获取模板信息接口调用示例 : get_preset_detail
52+
res = client.get_preset_detail(preset = presetname)
53+
print json.dumps(res)
54+
55+
#删除模板接口调用示例 : del_preset
56+
res = client.del_preset(preset = presetname)
57+
print json.dumps(res)
58+
59+
60+
#创建任务接口调用示例 : create_task
61+
#具体参数请参考官方文档
62+
task = {
63+
"dstDir": "",
64+
"dstObjectKey": "4.mp4",
65+
"dstBucket": "autotestoffline",
66+
"dstAcl": "public-read",
67+
"preset": presetname,
68+
"srcInfo": [
69+
{
70+
"path": "/autotestoffline/11.mp4",
71+
"type": "video",
72+
"index": 0
73+
}
74+
],
75+
"cbMethod": "POST",
76+
"cbUrl": "http://10.4.2.38:19090/"
77+
}
78+
79+
#该接口需要输入json格式数据，并且在参数前面加上"**"
80+
res = client.create_task(**task)
81+
print json.dumps(res)
82+
83+
#查看任务状态接口调用示例 : get_task_by_task_id
84+
taskid = "40d309d3b2bf373cd3f08e5b5e1bddf720160816"
85+
res = client.get_task_by_task_id(taskid = taskid)
86+
print json.dumps(res)
87+
88+
#获取任务列表接口调用示例 : get_task_list
89+
res = client.get_task_list()
90+
print json.dumps(res)
91+
92+
#删除任务接口调用示例 : del_task_by_task_id
93+
res = client.del_task_by_task_id(taskid = taskid)
94+
print json.dumps(res)
95+
96+
#任务置顶接口调用示例 : top_task_by_task_id
97+
res = client.top_task_by_task_id(taskid = taskid)
98+
print json.dumps(res)

‎kscore/data/eip/2016-03-04/service-2.yaml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,43 @@ operations:
1616
method: GET
1717
input:
1818
shape: Empty
19-
20-
DescribeAddresses:
21-
name: DescribeAddresses
19+
GetLines:
20+
name: GetLines
2221
http:
2322
method: GET
23+
AllocateAddress:
24+
name: AllocateAddress
25+
http:
26+
method: GET
27+
ReleaseAddress:
28+
name: ReleaseAddress
29+
http:
30+
method: GET
2431
AssociateAddress:
2532
name: AssociateAddress
2633
http:
2734
method: GET
2835
DisassociateAddress:
2936
name: DisassociateAddress
37+
http:
38+
method: GET
39+
DescribeAddresses:
40+
name: DescribeAddresses
3041
http:
3142
method: GET
43+
AssociateAddressPortfwd:
44+
name: AssociateAddressPortfwd
45+
http:
46+
method: GET
47+
DisassociateAddressPortfwd:
48+
name: DisassociateAddressPortfwd
49+
http:
50+
method: GET
51+
DescribeAddressPortfwds:
52+
name: DescribeAddressPortfwds
53+
http:
54+
method: GET
55+
3256

3357
shapes:
3458
Id:
@@ -63,11 +87,3 @@ shapes:
6387
id:
6488
shape: Id
6589
documentation: ""
66-
67-
DescribeAddresses:
68-
type: structure
69-
members:
70-
NextToken:
71-
shape: NonEmptyString
72-
MaxResults:
73-
shape: Int

‎kscore/data/endpoints.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,5 +88,14 @@ partitions:
8888
protocols:
8989
- http
9090
- https
91+
offline:
92+
defaults:
93+
credentialScope:
94+
service: offline
95+
EndpointRegion: cn-beijing-6
96+
endpoints:
97+
cn-beijing-6:
98+
protocols:
99+
- http
91100

92101

‎kscore/data/offline/2016-09-19/service-2.yaml

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
---
2+
version: '2.0'
3+
metadata:
4+
apiVersion: '2016-09-19'
5+
endpointPrefix: offline
6+
jsonVersion: '1.1'
7+
serviceFullName: KSC OFFLINE Service
8+
signatureVersion: v4
9+
targetPrefix: offline
10+
protocol: json2
11+
12+
operations:
13+
Preset:
14+
name: Preset
15+
http:
16+
method: POST
17+
18+
UpdatePreset:
19+
name: UpdatePreset
20+
http:
21+
method: POST
22+
23+
DelPreset:
24+
name: DelPreset
25+
http:
26+
method: GET
27+
requestUri: /
28+
input:
29+
shape: PresetInstance
30+
31+
GetPresetList:
32+
name: GetPresetList
33+
http:
34+
method: GET
35+
requestUri: /
36+
input:
37+
shape: WithDetailInstance
38+
39+
GetPresetDetail:
40+
name: GetPresetDetail
41+
http:
42+
method: GET
43+
requestUri: /
44+
input:
45+
shape: PresetInstance
46+
47+
CreateTask:
48+
name: CreateTask
49+
http:
50+
method: POST
51+
52+
DelTaskByTaskID:
53+
name: DelTaskByTaskID
54+
http:
55+
method: GET
56+
requestUri: /
57+
input:
58+
shape: TaskIDInstance
59+
60+
TopTaskByTaskID:
61+
name: TopTaskByTaskID
62+
http:
63+
method: GET
64+
requestUri: /
65+
input:
66+
shape: TaskIDInstance
67+
68+
GetTaskList:
69+
name: GetTaskList
70+
http:
71+
method: GET
72+
requestUri: /
73+
74+
GetTaskByTaskID:
75+
name: GetTaskByTaskID
76+
http:
77+
method: GET
78+
requestUri: /
79+
input:
80+
shape: TaskIDInstance
81+
82+
shapes:
83+
Preset:
84+
type: string
85+
WithDetail:
86+
type: integer
87+
TaskID:
88+
type: string
89+
min: 35
90+
max: 45
91+
PresetInstance:
92+
type: structure
93+
required:
94+
- preset
95+
members:
96+
preset:
97+
shape: Preset
98+
WithDetailInstance:
99+
type: structure
100+
members:
101+
withDetail:
102+
shape: WithDetail
103+
TaskIDInstance:
104+
type: structure
105+
required:
106+
- taskid
107+
members:
108+
taskid:
109+
shape: TaskID
110+
111+

‎kscore/data/slb/2016-03-04/service-2.yaml

Lines changed: 50 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,70 @@ operations:
1616
method: GET
1717
input:
1818
shape: Empty
19-
19+
CreateLoadBalancer:
20+
name: CreateLoadBalancer
21+
http:
22+
method: GET
23+
DeleteLoadBalancer:
24+
name: DeleteLoadBalancer
25+
http:
26+
method: GET
27+
ModifyLoadBalancer:
28+
name: ModifyLoadBalancer
29+
http:
30+
method: GET
31+
DescribeLoadBalancers:
32+
name: DescribeLoadBalancers
33+
http:
34+
method: GET
35+
CreateListeners:
36+
name: CreateListeners
37+
http:
38+
method: GET
39+
ModifyListeners:
40+
name: ModifyListeners
41+
http:
42+
method: GET
43+
DeleteListeners:
44+
name: DeleteListeners
45+
http:
46+
method: GET
2047
DescribeListeners:
2148
name: DescribeListeners
2249
http:
2350
method: GET
51+
ConfigureHealthCheck:
52+
name: ConfigureHealthCheck
53+
http:
54+
method: GET
55+
ModifyHealthCheck:
56+
name: ModifyHealthCheck
57+
http:
58+
method: GET
59+
DeleteHealthCheck:
60+
name: DeleteHealthCheck
61+
http:
62+
method: GET
63+
DescribeHealthChecks:
64+
name: DescribeHealthChecks
65+
http:
66+
method: GET
2467
RegisterInstancesWithListener:
2568
name: RegisterInstancesWithListener
2669
http:
2770
method: GET
28-
DescribeInstancesWithListener:
29-
name: DescribeInstancesWithListener
71+
ModifyInstancesWithListener:
72+
name: ModifyInstancesWithListener
3073
http:
3174
method: GET
3275
DeregisterInstancesFromListener:
3376
name: DeregisterInstancesFromListener
3477
http:
3578
method: GET
36-
79+
DescribeInstancesWithListener:
80+
name: DescribeInstancesWithListener
81+
http:
82+
method: GET
3783

3884
shapes:
3985
Id:

0 commit comments

Comments
 (0)