Skip to content

Commit 06cd4ae

Browse files
allmightyspiffallmightyspiff
authored
Merge pull request #1626 from allmightyspiff/soapTransport
Soap transport
2 parents 6b54d42 + e0f7fc3 commit 06cd4ae

34 files changed

Lines changed: 2067 additions & 1600 deletions

‎SoftLayer/fixtures/SoftLayer_Account.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,7 +1173,7 @@
11731173
"virtualizationPlatform": 0,
11741174
"requiredUser": "administrator@vsphere.local"
11751175
}
1176-
}
1176+
}
11771177
]
11781178

11791179
getActiveVirtualLicenses = [{

‎SoftLayer/fixtures/SoftLayer_Billing_Order.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
],
4545
'orderApprovalDate': '2019-09-15T13:13:13-06:00',
4646
'orderTotalAmount': '0'
47-
}]
47+
}]
4848

4949
getObject = {
5050
'accountId': 1234,

‎SoftLayer/fixtures/SoftLayer_Network_Storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
}
238238

239239
refreshDuplicate = {
240-
'dependentDuplicate': 1
240+
'dependentDuplicate': 1
241241
}
242242

243243
convertCloneDependentToIndependent = {

‎SoftLayer/fixtures/SoftLayer_Network_Vlan.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
'vlanNumber': 4444,
88
'firewallInterfaces': None,
99
'billingItem': {
10-
'allowCancellationFlag': 1,
11-
'categoryCode': 'network_vlan',
12-
'description': 'Private Network Vlan',
13-
'id': 235689,
14-
'notes': 'test cli',
15-
'orderItemId': 147258,
16-
}
10+
'allowCancellationFlag': 1,
11+
'categoryCode': 'network_vlan',
12+
'description': 'Private Network Vlan',
13+
'id': 235689,
14+
'notes': 'test cli',
15+
'orderItemId': 147258,
16+
}
1717
}
1818

1919
editObject = True

‎SoftLayer/fixtures/SoftLayer_Product_Package.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2137,7 +2137,7 @@
21372137
"recurringFee": "0",
21382138
"setupFee": "0",
21392139
"sort": 10,
2140-
}]
2140+
}]
21412141
}, {
21422142
"description": "Public Network Vlan",
21432143
"id": 1071,
@@ -2168,6 +2168,6 @@
21682168
"recurringFee": "0",
21692169
"setupFee": "0",
21702170
"sort": 10,
2171-
}]
2171+
}]
21722172
}
21732173
]

‎SoftLayer/fixtures/SoftLayer_Software_AccountLicense.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
getAllObjects = [{
2-
"capacity": "4",
3-
"key": "ABCDE-6CJ8L-J8R9H-000R0-CDR70",
4-
"units": "CPU",
5-
"billingItem": {
6-
"allowCancellationFlag": 1,
7-
"categoryCode": "software_license",
8-
"createDate": "2018-10-22T11:16:48-06:00",
9-
"cycleStartDate": "2021-06-03T23:11:22-06:00",
10-
"description": "vCenter Server Appliance 6.0",
11-
"id": 123654789,
12-
"lastBillDate": "2021-06-03T23:11:22-06:00",
13-
"modifyDate": "2021-06-03T23:11:22-06:00",
14-
"nextBillDate": "2021-07-03T23:00:00-06:00",
15-
"orderItemId": 385054741,
16-
"recurringMonths": 1,
17-
"serviceProviderId": 1,
18-
},
19-
"softwareDescription": {
20-
"id": 1529,
21-
"longDescription": "VMware vCenter 6.0",
22-
"manufacturer": "VMware",
23-
"name": "vCenter",
24-
"version": "6.0",
25-
"requiredUser": "administrator@vsphere.local"
26-
}
2+
"capacity": "4",
3+
"key": "ABCDE-6CJ8L-J8R9H-000R0-CDR70",
4+
"units": "CPU",
5+
"billingItem": {
6+
"allowCancellationFlag": 1,
7+
"categoryCode": "software_license",
8+
"createDate": "2018-10-22T11:16:48-06:00",
9+
"cycleStartDate": "2021-06-03T23:11:22-06:00",
10+
"description": "vCenter Server Appliance 6.0",
11+
"id": 123654789,
12+
"lastBillDate": "2021-06-03T23:11:22-06:00",
13+
"modifyDate": "2021-06-03T23:11:22-06:00",
14+
"nextBillDate": "2021-07-03T23:00:00-06:00",
15+
"orderItemId": 385054741,
16+
"recurringMonths": 1,
17+
"serviceProviderId": 1,
2718
},
19+
"softwareDescription": {
20+
"id": 1529,
21+
"longDescription": "VMware vCenter 6.0",
22+
"manufacturer": "VMware",
23+
"name": "vCenter",
24+
"version": "6.0",
25+
"requiredUser": "administrator@vsphere.local"
26+
}
27+
},
2828
{
2929
"capacity": "1",
3030
"key": "CBERT-4RL92-K8999-031K4-AJF5J",
@@ -48,4 +48,4 @@
4848
"name": "Virtual SAN Advanced Tier III",
4949
"version": "6.2",
5050
}
51-
}]
51+
}]

‎SoftLayer/fixtures/SoftLayer_Virtual_Guest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
'item': {'description': '2 GB'},
318318
'hourlyRecurringFee': '.06',
319319
'recurringFee': '42'
320-
},
320+
},
321321
'template': {'maxMemory': 2048}
322322
},
323323
{

‎SoftLayer/fixtures/soap/SoftLayer_Account_getObject.soap‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://api.service.softlayer.com/soap/v3.1/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<SOAP-ENV:Body>
4+
<ns1:getObjectResponse>
5+
<getObjectReturn xsi:type="ns1:SoftLayer_Account">
6+
<companyName xsi:type="xsd:string">SoftLayer Internal - Development Community</companyName>
7+
<id xsi:type="xsd:int">307608</id>
8+
</getObjectReturn>
9+
</ns1:getObjectResponse>
10+
</SOAP-ENV:Body>
11+
</SOAP-ENV:Envelope>

‎SoftLayer/fixtures/soap/SoftLayer_Account_getVirtualGuests.soap‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://api.service.softlayer.com/soap/v3.1/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<SOAP-ENV:Header>
4+
<ns1:totalItems>
5+
<amount>1</amount>
6+
</ns1:totalItems>
7+
</SOAP-ENV:Header>
8+
<SOAP-ENV:Body>
9+
<ns1:getVirtualGuestsResponse>
10+
<getVirtualGuestsReturn SOAP-ENC:arrayType="ns1:SoftLayer_Virtual_Guest[1]" xsi:type="ns1:SoftLayer_Virtual_GuestArray">
11+
<item xsi:type="ns1:SoftLayer_Virtual_Guest">
12+
<domain xsi:type="xsd:string">cgallo.com</domain>
13+
<hostname xsi:type="xsd:string">KVM-Test</hostname>
14+
<id xsi:type="xsd:int">121401696</id>
15+
</item>
16+
</getVirtualGuestsReturn>
17+
</ns1:getVirtualGuestsResponse>
18+
</SOAP-ENV:Body>
19+
</SOAP-ENV:Envelope>

‎SoftLayer/fixtures/soap/SoftLayer_Virtual_Guest_getObject.soap‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<SOAP-ENV:Envelope SOAP-ENV:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENC="http://schemas.xmlsoap.org/soap/encoding/" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:ns1="http://api.service.softlayer.com/soap/v3.1/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<SOAP-ENV:Body>
4+
<ns1:getObjectResponse>
5+
<getObjectReturn xsi:type="ns1:SoftLayer_Virtual_Guest">
6+
<domain xsi:type="xsd:string">ibm.com</domain>
7+
<hostname xsi:type="xsd:string">KVM-Test</hostname>
8+
<id xsi:type="xsd:int">121401696</id>
9+
</getObjectReturn>
10+
</ns1:getObjectResponse>
11+
</SOAP-ENV:Body>
12+
</SOAP-ENV:Envelope>

0 commit comments

Comments
 (0)