From 69a4e5067a5942b4f3b09d8f78bc0ea4b904e584 Mon Sep 17 00:00:00 2001 From: Markos Gogoulos Date: Tue, 12 Nov 2013 19:52:06 +0200 Subject: [PATCH] Issue LIBCLOUD-416: Improvements to SoftLayer compute driver --- libcloud/compute/drivers/softlayer.py | 141 +- .../v3_SoftLayer_Account_getVirtualGuests.xml | 1823 +-- ...tLayer_Virtual_Guest_getCreateObjectOptions.xml |12470 +++++++++++++++++++- .../v3__SoftLayer_Virtual_Guest_getObject.xml | 118 +- libcloud/test/compute/test_softlayer.py | 30 +- 5 files changed, 13800 insertions(+), 782 deletions(-) diff --git a/libcloud/compute/drivers/softlayer.py b/libcloud/compute/drivers/softlayer.py index ab716d5..7c87a5f 100644 --- a/libcloud/compute/drivers/softlayer.py +++ b/libcloud/compute/drivers/softlayer.py @@ -25,25 +25,31 @@ from libcloud.compute.types import Provider, NodeState from libcloud.compute.base import NodeDriver, Node, NodeLocation, NodeSize, \ NodeImage +DEFAULT_DOMAIN = 'example.com' +DEFAULT_CPU_SIZE = 1 +DEFAULT_RAM_SIZE = 2048 +DEFAULT_DISK_SIZE = 100 + DATACENTERS = { 'hou02': {'country': 'US'}, - 'sea01': {'country': 'US'}, - 'wdc01': {'country': 'US'}, + 'sea01': {'country': 'US', 'name': 'Seattle - West Coast U.S.'}, + 'wdc01': {'country': 'US', 'name': 'Washington, DC - East Coast U.S.'}, 'dal01': {'country': 'US'}, 'dal02': {'country': 'US'}, 'dal04': {'country': 'US'}, - 'dal05': {'country': 'US'}, + 'dal05': {'country': 'US', 'name': 'Dallas - Central U.S.'}, 'dal06': {'country': 'US'}, 'dal07': {'country': 'US'}, - 'sjc01': {'country': 'US'}, - 'sng01': {'country': 'SG'}, - 'ams01': {'country': 'NL'}, + 'sjc01': {'country': 'US', 'name': 'San Jose - West Coast U.S.'}, + 'sng01': {'country': 'SG', 'name': 'Singapore - Southeast Asia'}, + 'ams01': {'country': 'NL', 'name': 'Amsterdam - Western Europe'}, } NODE_STATE_MAP = { 'RUNNING': NodeState.RUNNING, - 'HALTED': NodeState.TERMINATED, - 'PAUSED': NodeState.TERMINATED, + 'HALTED': NodeState.UNKNOWN, + 'PAUSED': NodeState.UNKNOWN, + 'INITIATING': NodeState.PENDING } SL_BASE_TEMPLATES = [ @@ -58,20 +64,60 @@ SL_BASE_TEMPLATES = [ 'disk': 100, 'cpus': 1, }, { + 'name': '1 CPU, 2GB ram, 100GB', + 'ram': 2 * 1024, + 'disk': 100, + 'cpus': 1, + }, { + 'name': '1 CPU, 4GB ram, 100GB', + 'ram': 4 * 1024, + 'disk': 100, + 'cpus': 1, + }, { 'name': '2 CPU, 2GB ram, 100GB', + 'ram': 2 * 1024, + 'disk': 100, + 'cpus': 2, + }, { + 'name': '2 CPU, 4GB ram, 100GB', 'ram': 4 * 1024, 'disk': 100, 'cpus': 2, }, { + 'name': '2 CPU, 8GB ram, 100GB', + 'ram': 8 * 1024, + 'disk': 100, + 'cpus': 2, + }, { 'name': '4 CPU, 4GB ram, 100GB', 'ram': 4 * 1024, 'disk': 100, 'cpus': 4, }, { + 'name': '4 CPU, 8GB ram, 100GB', + 'ram': 8 * 1024, + 'disk': 100, + 'cpus': 4, + }, { + 'name': '6 CPU, 4GB ram, 100GB', + 'ram': 4 * 1024, + 'disk': 100, + 'cpus': 6, + }, { + 'name': '6 CPU, 8GB ram, 100GB', + 'ram': 8 * 1024, + 'disk': 100, + 'cpus': 6, + }, { 'name': '8 CPU, 8GB ram, 100GB', 'ram': 8 * 1024, 'disk': 100, 'cpus': 8, + }, { + 'name': '8 CPU, 16GB ram, 100GB', + 'ram': 16 * 1024, + 'disk': 100, + 'cpus': 8, }] SL_TEMPLATES = {} @@ -79,12 +125,7 @@ for i, template in enumerate(SL_BASE_TEMPLATES): # Add local disk templates local = template.copy() local['local_disk'] = True - SL_TEMPLATES['sl%s_local_disk' % (i + 1,)] = local - - # Add san disk templates - san = template.copy() - san['local_disk'] = False - SL_TEMPLATES['sl%s_san_disk' % (i + 1,)] = san + SL_TEMPLATES[i] = local class SoftLayerException(LibcloudError): @@ -177,18 +218,35 @@ class SoftLayerNodeDriver(NodeDriver): recurringFee = host.get('billingItem', {}).get('recurringFee', 0) recurringMonths = host.get('billingItem', {}).get('recurringMonths', 0) createDate = host.get('createDate', None) + #When machine is launching it gets state halted + #we change this to pending + state = NODE_STATE_MAP.get( + host['powerState']['keyName'], NodeState.UNKNOWN) + if not password and state == NodeState.UNKNOWN: + state = NODE_STATE_MAP['INITIATING'] + + public_ips = [] + if 'primaryIpAddress' in host: + public_ips.append(host['primaryIpAddress']) + private_ips = [] + if 'primaryBackendIpAddress' in host: + private_ips.append(host['primaryBackendIpAddress']) return Node( id=host['id'], name=host['hostname'], - state=NODE_STATE_MAP.get( - host['powerState']['keyName'], NodeState.UNKNOWN - ), - public_ips=[host['primaryIpAddress']], - private_ips=[host['primaryBackendIpAddress']], + state=state, + public_ips=public_ips, + private_ips=private_ips, driver=self, extra={ 'password': password, + 'maxCpu': host.get('maxCpu', None), + 'datacenter': host.get('datacenter', {}).get('longName', None), + 'maxMemory': host.get('maxMemory', None), + 'image': host.get('operatingSystem', {}).get('softwareLicense', + {}).get('softwareDescription', + {}).get('longDescription', None), 'hourlyRecurringFee': hourlyRecurringFee, 'recurringFee': recurringFee, 'recurringMonths': recurringMonths, @@ -208,6 +266,18 @@ class SoftLayerNodeDriver(NodeDriver): ) return True + def ex_stop_node(self, node): + self.connection.request( + 'SoftLayer_Virtual_Guest', 'powerOff', id=node.id + ) + return True + + def ex_start_node(self, node): + self.connection.request( + 'SoftLayer_Virtual_Guest', 'powerOn', id=node.id + ) + return True + def _get_order_information(self, node_id, timeout=1200, check_interval=5): mask = { 'billingItem': '', @@ -260,14 +330,16 @@ class SoftLayerNodeDriver(NodeDriver): elif 'image' in kwargs: os = kwargs['image'].id - size = kwargs.get('size', NodeSize(id=None, name='Custom', ram=None, + size = kwargs.get('size', NodeSize(id=123, name='Custom', ram=None, disk=None, bandwidth=None, price=None, driver=self.connection.driver)) - - ex_size_data = SL_TEMPLATES.get(size.id) or {} - cpu_count = kwargs.get('ex_cpus') or ex_size_data.get('cpus') or 1 - ram = kwargs.get('ex_ram') or size.ram or 2048 + ex_size_data = SL_TEMPLATES.get(int(size.id)) or {} + #plan keys are ints + cpu_count = kwargs.get('ex_cpus') or ex_size_data.get('cpus') or \ + DEFAULT_CPU_SIZE + ram = kwargs.get('ex_ram') or ex_size_data.get('ram') or \ + DEFAULT_RAM_SIZE bandwidth = kwargs.get('ex_bandwidth') or size.bandwidth or 10 hourly = 'true' if kwargs.get('ex_hourly', True) else 'false' @@ -278,7 +350,7 @@ class SoftLayerNodeDriver(NodeDriver): if kwargs.get('ex_local_disk') is False: local_disk = 'false' - disk_size = 100 + disk_size = DEFAULT_DISK_SIZE if size.disk: disk_size = size.disk if kwargs.get('ex_disk'): @@ -297,7 +369,7 @@ class SoftLayerNodeDriver(NodeDriver): if domain is None: # TODO: domain is a required argument for the Sofylayer API, but it # it shouldn't be. - domain = 'example.com' + domain = DEFAULT_DOMAIN newCCI = { 'hostname': name, @@ -360,21 +432,28 @@ class SoftLayerNodeDriver(NodeDriver): def _to_loc(self, loc): country = 'UNKNOWN' - if loc['name'] in DATACENTERS: - country = DATACENTERS[loc['name']]['country'] - return NodeLocation(id=loc['name'], name=loc['longName'], + loc_id = loc['template']['datacenter']['name'] + name = loc_id + + if loc_id in DATACENTERS: + country = DATACENTERS[loc_id]['country'] + name = DATACENTERS[loc_id].get('name', loc_id) + return NodeLocation(id=loc_id, name=name, country=country, driver=self) def list_locations(self): res = self.connection.request( - 'SoftLayer_Location_Datacenter', 'getDatacenters' + 'SoftLayer_Virtual_Guest', 'getCreateObjectOptions' ).object - return [self._to_loc(l) for l in res] + return [self._to_loc(l) for l in res['datacenters']] def list_nodes(self): mask = { 'virtualGuests': { 'powerState': '', + 'hostname': '', + 'maxMemory': '', + 'datacenter': '', 'operatingSystem': {'passwords': ''}, 'billingItem': '', }, diff --git a/libcloud/test/compute/fixtures/softlayer/v3_SoftLayer_Account_getVirtualGuests.xml b/libcloud/test/compute/fixtures/softlayer/v3_SoftLayer_Account_getVirtualGuests.xml index ddabcc5..2216121 100644 --- a/libcloud/test/compute/fixtures/softlayer/v3_SoftLayer_Account_getVirtualGuests.xml +++ b/libcloud/test/compute/fixtures/softlayer/v3_SoftLayer_Account_getVirtualGuests.xml @@ -7,51 +7,63 @@ - privateNetworkOnlyFlag + accountId - 0 + 282402 - id + createDate - 1832 + 2013-11-06T14:38:36+01:00 - accountId + dedicatedAccountHostOnlyFlag - 11111 + 0 - statusId + domain - 1001 + example.com - uuid + fullyQualifiedDomainName - eaa9aaa2-8e2e-d6e0-ce11-6f01e765779c + libcloud-testing1.example.com hostname - test1 + libcloud-testing1 - domain + id + + 2875152 + + + + lastPowerStateId + + + + + + lastVerifiedDate - libcloud.org + maxCpu - 2 + 1 @@ -67,148 +79,454 @@ - startCpus + metricPollDate - 2 + - createDate + modifyDate - 2009-09-04T14:49:45-05:00 + 2013-11-06T14:41:25+01:00 - modifyDate + startCpus - 2010-04-22T13:08:47-05:00 + 1 - metricPollDate + statusId - 2010-04-22T13:08:00-05:00 + 1001 - dedicatedAccountHostOnlyFlag + uuid - 0 + ab98fc82-9d74-bc34-6701-f88957ebbba8 - powerState + billingItem - name + allowCancellationFlag - Running + 1 - keyName + cancellationDate - RUNNING + + + + + categoryCode + + guest_core + + + + createDate + + 2013-11-06T14:38:38+01:00 + + + + currentHourlyCharge + + .112 + + + + cycleStartDate + + 2013-11-06T14:43:20+01:00 + + + + description + + 1 x 2.0 GHz Core + + + + domainName + + example.com + + + + hostName + + libcloud-testing1 + + + + hourlyRecurringFee + + .056 + + + + hoursUsed + + 2 + + + + id + + 16447700 + + + + laborFee + + 0 + + + + laborFeeTaxRate + + .21 + + + + lastBillDate + + 2013-11-06T14:43:20+01:00 + + + + modifyDate + + 2013-11-06T14:43:20+01:00 + + + + nextBillDate + + 2013-11-28T07:00:00+01:00 + + + + oneTimeFee + + 0 + + + + oneTimeFeeTaxRate + + .21 + + + + orderItemId + + 22662589 + + + + parentId + + + + + + recurringFee + + .112 + + + + recurringFeeTaxRate + + .21 + + + + recurringMonths + + 1 + + + + serviceProviderId + + 1 + + + + setupFee + + 0 + + + + setupFeeTaxRate + + .21 + + + + resourceTableId + + 2875152 + + + + + + + datacenter + + + + id + + 168642 + + + + longName + + San Jose 1 + + + + name + + sjc01 + globalIdentifier + + 9ee84f87-e558-4548-9b89-fe7d997706b8 + + + operatingSystem - + + + hardwareId - - - id + + + + + id + + 2200995 + + + + manufacturerLicenseInstance + + + + + + passwords + + + - 191115 + + + createDate + + 2013-11-06T14:38:56+01:00 + + + + id + + 1856975 + + + + modifyDate + + 2013-11-06T14:38:56+01:00 + + + + password + + L3TJVubf + + + + port + + + + + + softwareId + + 2200995 + + + + username + + root + + + - + + + + + + softwareLicense + + - hardwareId + id - + 1523 - manufacturerLicenseInstance + softwareDescriptionId - + 1163 - passwords + softwareDescription - - + + + controlPanel + + 0 + + + + id + + 1163 + + + + longDescription + + Debian / Debian / 7.0.0-64 Minimal for CCI + + + + manufacturer + + Debian + + + + name + + Debian + + + + operatingSystem + + 1 + + + + referenceCode + + DEBIAN_7_64 + + + + upgradeSoftwareDescriptionId + + + + + + upgradeSwDescId + + + + + + version + + 7.0.0-64 Minimal for CCI + + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser - - - id - - 166980 - - - - softwareId - - 191115 - - - - username - - root - - - - password - - TEST - - - - createDate - - 2009-09-04T14:49:51-05:00 - - - - modifyDate - - 2009-09-04T14:49:51-05:00 - - - - port - - - - - + root - - + + - + + - primaryIpAddress + powerState - 67.254.254.254 + + + keyName + + RUNNING + + + + name + + Running + + + primaryBackendIpAddress - 10.254.254.254 + 10.55.43.130 + + + + primaryIpAddress + + 50.23.95.202 @@ -216,45 +534,57 @@ - privateNetworkOnlyFlag + accountId - 0 + 282402 - id + createDate - 13402 + 2013-11-06T15:14:52+01:00 - accountId + dedicatedAccountHostOnlyFlag - 11111 + 0 - statusId + domain - 1001 + example.com - uuid + fullyQualifiedDomainName - 9e9e9e99-4ed9-4645-19f3-55ee4e404d56 + libcloud-testing2.example.com hostname - test2 + libcloud-testing2 - domain + id + + 2875213 + + + + lastPowerStateId + + + + + + lastVerifiedDate - libcloud.org + @@ -272,154 +602,403 @@ maxMemory - 1024 + 2048 - startCpus + metricPollDate - 1 + - createDate + modifyDate - 2010-03-23T17:06:13-05:00 + 2013-11-06T15:17:56+01:00 - modifyDate + startCpus - 2010-04-22T13:08:43-05:00 + 1 - metricPollDate + statusId - 2010-04-22T13:08:00-05:00 + 1001 - dedicatedAccountHostOnlyFlag + uuid - 0 + 8f10bea1-3e26-70d7-d581-0d9e820eae0c - powerState + billingItem - name + allowCancellationFlag - Running + 1 - keyName + cancellationDate - RUNNING + + + + + categoryCode + + guest_core + + + + createDate + + 2013-11-06T15:14:55+01:00 + + + + currentHourlyCharge + + .056 + + + + cycleStartDate + + 2013-11-06T15:19:50+01:00 + + + + description + + 1 x 2.0 GHz Core + + + + domainName + + example.com + + + + hostName + + libcloud-testing2 + + + + hourlyRecurringFee + + .056 + + + + hoursUsed + + 1 + + + + id + + 16447908 + + + + laborFee + + 0 + + + + laborFeeTaxRate + + .21 + + + + lastBillDate + + 2013-11-06T15:19:50+01:00 + + + + modifyDate + + 2013-11-06T15:19:50+01:00 + + + + nextBillDate + + 2013-11-28T07:00:00+01:00 + + + + oneTimeFee + + 0 + + + + oneTimeFeeTaxRate + + .21 + + + + orderItemId + + 22663091 + + + + parentId + + + + + + recurringFee + + .056 + + + + recurringFeeTaxRate + + .21 + + + + recurringMonths + + 1 + + + + serviceProviderId + + 1 + + + + setupFee + + 0 + + + + setupFeeTaxRate + + .21 + + + + resourceTableId + + 2875213 + + + + + + + datacenter + + + + id + + 168642 + + + + longName + + San Jose 1 + + + + name + + sjc01 - softwareComponents + globalIdentifier - - + 5c704e34-6ee7-4efe-9722-af9d406fa930 + + + + operatingSystem + + + + hardwareId + + + + + + id + + 2201027 + + + + manufacturerLicenseInstance + + + + + + softwareLicense id - 257314 - - - - hardwareId - - + 1523 - manufacturerLicenseInstance + softwareDescriptionId - + 1163 - passwords + softwareDescription - - + + + controlPanel + + 0 + + + + id + + 1163 + + + + longDescription + + Debian / Debian / 7.0.0-64 Minimal for CCI + + + + manufacturer + + Debian + + + + name + + Debian + + + + operatingSystem - - - id - - 235268 - - - - softwareId - - 257314 - - - - username - - root - - - - password - - TEST - - - - createDate - - 2010-03-23T17:06:17-05:00 - - - - modifyDate - - 2010-03-23T17:06:17-05:00 - - - - port - - - - - + 1 - - + + + referenceCode + + DEBIAN_7_64 + + + + upgradeSoftwareDescriptionId + + + + + + upgradeSwDescId + + + + + + version + + 7.0.0-64 Minimal for CCI + + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser + + root + + + - - + + - primaryIpAddress + powerState - 174.254.254.254 + + + keyName + + INITIATING + + + + name + + Running + + + primaryBackendIpAddress - 10.254.254.254 + 10.55.43.131 + + + + primaryIpAddress + + 50.23.95.203 @@ -427,515 +1006,495 @@ - privateNetworkOnlyFlag + accountId - 0 + 282402 - id + createDate - 19293 + 2013-11-06T15:36:53+01:00 - accountId + dedicatedAccountHostOnlyFlag - 11111 + 0 - statusId + domain - 1001 + example.com - uuid + fullyQualifiedDomainName - 9f99e19b-2c61-9cd5-2081-67b57fd7977b + libcloud-testing.example.com hostname - test3 + libcloud-testing - domain + id - libcloud.org + 2875273 - maxCpu + lastPowerStateId - 2 + - maxCpuUnits + lastVerifiedDate - CORE + - maxMemory + maxCpu - 1024 + 1 - startCpus + maxCpuUnits - 2 + CORE - createDate + maxMemory - 2010-04-22T12:38:53-05:00 + 2048 - modifyDate + metricPollDate - 2010-04-22T13:08:01-05:00 + - metricPollDate + modifyDate - 2010-04-22T13:08:00-05:00 + 2013-11-06T15:39:35+01:00 - dedicatedAccountHostOnlyFlag + startCpus - 1 + 1 - powerState + statusId + + 1001 + + + + uuid + + f86371c5-103b-34d3-ae27-e4dafa1c4718 + + + + billingItem - name + allowCancellationFlag - Running + 1 - keyName + cancellationDate - RUNNING + + + + + categoryCode + + guest_core + + + + createDate + + 2013-11-06T15:36:55+01:00 + + + + currentHourlyCharge + + .056 + + + + cycleStartDate + + 2013-11-06T15:41:31+01:00 + + + + description + + 1 x 2.0 GHz Core + + + + domainName + + example.com + + + + hostName + + libcloud-testing + + + + hourlyRecurringFee + + .056 + + + + hoursUsed + + 1 + + + + id + + 16448162 + + + + laborFee + + 0 + + + + laborFeeTaxRate + + .21 + + + + lastBillDate + + 2013-11-06T15:41:31+01:00 + + + + modifyDate + + 2013-11-06T15:41:31+01:00 + + + + nextBillDate + + 2013-11-28T07:00:00+01:00 + + + + oneTimeFee + + 0 + + + + oneTimeFeeTaxRate + + .21 + + + + orderItemId + + 22663578 + + + + parentId + + + + + + recurringFee + + .056 + + + + recurringFeeTaxRate + + .21 + + + + recurringMonths + + 1 + + + + serviceProviderId + + 1 + + + + setupFee + + 0 + + + + setupFeeTaxRate + + .21 + + + + resourceTableId + + 2875273 - softwareComponents + datacenter - - + + + id - - - id - - 277185 - - - - hardwareId - - - - - - manufacturerLicenseInstance - - - - - - passwords - - - - - - - id - - 250826 - - - - softwareId - - 277185 - - - - username - - root - - - - password - - TEST - - - - createDate - - 2010-04-22T12:38:57-05:00 - - - - modifyDate - - 2010-04-22T12:38:57-05:00 - - - - port - - - - - - - - - - - + 168642 - - - - - - primaryIpAddress - - 174.254.254.254 - - - - primaryBackendIpAddress - - 10.254.254.254 - - - - - - - - privateNetworkOnlyFlag - - 0 - - - - id - - 19288 - - - - accountId - - 11111 - - - - statusId - - 1001 - - - - uuid - - 999f77d9-679b-c47d-136d-04cd302384ec - - - - hostname - - test4 - - - - domain - - libcloud.org - - - - maxCpu - - 2 - - - - maxCpuUnits - - CORE - - - - maxMemory - - 1024 - - - - startCpus - - 2 - - - - createDate - - 2010-04-22T12:15:24-05:00 - - - - modifyDate - - 2010-04-22T13:08:31-05:00 - - - - metricPollDate - - 2010-04-22T13:08:00-05:00 + + + longName + + San Jose 1 + + + + name + + sjc01 + + + - dedicatedAccountHostOnlyFlag + globalIdentifier - 1 + e8ab9d1c-edd8-4a1a-a13c-ff74838b5ab6 - powerState + operatingSystem - name + hardwareId - Running + - keyName + id - RUNNING + 2201049 - - - - - softwareComponents - - - + + manufacturerLicenseInstance - - - id + + + + + passwords + + + - 277171 + + + createDate + + 2013-11-06T15:37:10+01:00 + + + + id + + 1857066 + + + + modifyDate + + 2013-11-06T15:37:10+01:00 + + + + password + + HmyHw89J + + + + port + + + + + + softwareId + + 2201049 + + + + username + + root + + + - + + + + + + softwareLicense + + - hardwareId + id - + 1523 - manufacturerLicenseInstance + softwareDescriptionId - + 1163 - passwords + softwareDescription - - + + + controlPanel + + 0 + + + + id + + 1163 + + + + longDescription + + Debian / Debian / 7.0.0-64 Minimal for CCI + + + + manufacturer + + Debian + + + + name + + Debian + + + + operatingSystem + + 1 + + + + referenceCode + + DEBIAN_7_64 + + + + upgradeSoftwareDescriptionId + + + + + + upgradeSwDescId + + + + + + version - - - id - - 250815 - - - - softwareId - - 277171 - - - - username - - root - - - - password - - TEST - - - - createDate - - 2010-04-22T12:15:26-05:00 - - - - modifyDate - - 2010-04-22T12:15:26-05:00 - - - - port - - - - - + 7.0.0-64 Minimal for CCI - - + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser + + root + + + - - - - - - primaryIpAddress - - 174.254.254.254 - - - - primaryBackendIpAddress - - 10.254.254.254 - - - - - - - - privateNetworkOnlyFlag - - 0 - - - - id - - 19284 - - - - accountId - - 11111 - - - - statusId - - 1001 - - - - uuid - - f3c73738-7731-1372-f3c3-e6808082f824 - - - - hostname - - test5 - - - - domain - - libcloud.org - - - - maxCpu - - 2 - - - - maxCpuUnits - - CORE - - - - maxMemory - - 1024 - - - - startCpus - - 2 - - - - createDate - - 2010-04-22T12:11:23-05:00 - - - - modifyDate - - 2010-04-22T13:08:31-05:00 - - - - metricPollDate - - 2010-04-22T13:08:00-05:00 - - - - dedicatedAccountHostOnlyFlag - - 1 + + @@ -943,116 +1502,30 @@ - name + keyName - Running + RUNNING - keyName + name - RUNNING + Running - softwareComponents + primaryBackendIpAddress - - - - - - id - - 277167 - - - - hardwareId - - - - - - manufacturerLicenseInstance - - - - - - passwords - - - - - - - id - - 250811 - - - - softwareId - - 277167 - - - - username - - root - - - - password - - TEST - - - - createDate - - 2010-04-22T12:11:27-05:00 - - - - modifyDate - - 2010-04-22T12:11:27-05:00 - - - - port - - - - - - - - - - - - - - + 10.55.43.132 primaryIpAddress - 174.254.254.254 - - - - primaryBackendIpAddress - - 10.254.254.254 + 50.23.95.204 diff --git a/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getCreateObjectOptions.xml b/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getCreateObjectOptions.xml index 881915d..a6d94a6 100644 --- a/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getCreateObjectOptions.xml +++ b/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getCreateObjectOptions.xml @@ -4,7 +4,7 @@ - operatingSystems + blockDevices @@ -33,7 +33,7 @@ description - CentOS 6.0 - Minimal Install (64 bit) + 25 GB (SAN) @@ -47,9 +47,12469 @@ - operatingSystemReferenceCode + blockDevices - CENTOS_6_64 + + + + + + device + + 0 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .025 + + + + recurringFee + + 18 + + + + item + + + + description + + 100 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 0 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .012 + + + + recurringFee + + 8 + + + + item + + + + description + + 10 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 10 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .015 + + + + recurringFee + + 10 + + + + item + + + + description + + 20 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 20 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .016 + + + + recurringFee + + 11 + + + + item + + + + description + + 25 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .017 + + + + recurringFee + + 12 + + + + item + + + + description + + 30 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 30 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .019 + + + + recurringFee + + 14 + + + + item + + + + description + + 40 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 40 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .021 + + + + recurringFee + + 16 + + + + item + + + + description + + 50 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 50 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .023 + + + + recurringFee + + 17 + + + + item + + + + description + + 75 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 75 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .025 + + + + recurringFee + + 18 + + + + item + + + + description + + 100 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .028 + + + + recurringFee + + 19 + + + + item + + + + description + + 125 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 125 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .03 + + + + recurringFee + + 20 + + + + item + + + + description + + 150 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 150 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .035 + + + + recurringFee + + 21 + + + + item + + + + description + + 175 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 175 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .04 + + + + recurringFee + + 22 + + + + item + + + + description + + 200 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 200 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 25 + + + + item + + + + description + + 250 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 250 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .06 + + + + recurringFee + + 32.5 + + + + item + + + + description + + 300 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 300 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .07 + + + + recurringFee + + 40 + + + + item + + + + description + + 350 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 350 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + 400 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 400 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + 500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .15 + + + + recurringFee + + 75 + + + + item + + + + description + + 750 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 750 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .2 + + + + recurringFee + + 100 + + + + item + + + + description + + 1,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 1000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .25 + + + + recurringFee + + 150 + + + + item + + + + description + + 1,500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 1500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .3 + + + + recurringFee + + 200 + + + + item + + + + description + + 2,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 2000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .012 + + + + recurringFee + + 8 + + + + item + + + + description + + 10 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 10 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .015 + + + + recurringFee + + 10 + + + + item + + + + description + + 20 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 20 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .016 + + + + recurringFee + + 11 + + + + item + + + + description + + 25 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .017 + + + + recurringFee + + 12 + + + + item + + + + description + + 30 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 30 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .019 + + + + recurringFee + + 14 + + + + item + + + + description + + 40 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 40 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .021 + + + + recurringFee + + 16 + + + + item + + + + description + + 50 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 50 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .023 + + + + recurringFee + + 17 + + + + item + + + + description + + 75 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 75 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .025 + + + + recurringFee + + 18 + + + + item + + + + description + + 100 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .028 + + + + recurringFee + + 19 + + + + item + + + + description + + 125 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 125 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .03 + + + + recurringFee + + 20 + + + + item + + + + description + + 150 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 150 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .035 + + + + recurringFee + + 21 + + + + item + + + + description + + 175 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 175 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .04 + + + + recurringFee + + 22 + + + + item + + + + description + + 200 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 200 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 25 + + + + item + + + + description + + 250 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 250 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .06 + + + + recurringFee + + 32.5 + + + + item + + + + description + + 300 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 300 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .07 + + + + recurringFee + + 40 + + + + item + + + + description + + 350 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 350 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + 400 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 400 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + 500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .15 + + + + recurringFee + + 75 + + + + item + + + + description + + 750 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 750 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .2 + + + + recurringFee + + 100 + + + + item + + + + description + + 1,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 1000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .25 + + + + recurringFee + + 150 + + + + item + + + + description + + 1,500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 1500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .3 + + + + recurringFee + + 200 + + + + item + + + + description + + 2,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 3 + + + + diskImage + + + + capacity + + 2000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .012 + + + + recurringFee + + 8 + + + + item + + + + description + + 10 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 10 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .015 + + + + recurringFee + + 10 + + + + item + + + + description + + 20 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 20 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .016 + + + + recurringFee + + 11 + + + + item + + + + description + + 25 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .017 + + + + recurringFee + + 12 + + + + item + + + + description + + 30 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 30 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .019 + + + + recurringFee + + 14 + + + + item + + + + description + + 40 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 40 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .021 + + + + recurringFee + + 16 + + + + item + + + + description + + 50 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 50 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .023 + + + + recurringFee + + 17 + + + + item + + + + description + + 75 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 75 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .025 + + + + recurringFee + + 18 + + + + item + + + + description + + 100 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .028 + + + + recurringFee + + 19 + + + + item + + + + description + + 125 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 125 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .03 + + + + recurringFee + + 20 + + + + item + + + + description + + 150 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 150 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .035 + + + + recurringFee + + 21 + + + + item + + + + description + + 175 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 175 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .04 + + + + recurringFee + + 22 + + + + item + + + + description + + 200 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 200 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 25 + + + + item + + + + description + + 250 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 250 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .06 + + + + recurringFee + + 32.5 + + + + item + + + + description + + 300 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 300 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .07 + + + + recurringFee + + 40 + + + + item + + + + description + + 350 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 350 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + 400 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 400 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + 500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .15 + + + + recurringFee + + 75 + + + + item + + + + description + + 750 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 750 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .2 + + + + recurringFee + + 100 + + + + item + + + + description + + 1,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 1000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .25 + + + + recurringFee + + 150 + + + + item + + + + description + + 1,500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 1500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .3 + + + + recurringFee + + 200 + + + + item + + + + description + + 2,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 4 + + + + diskImage + + + + capacity + + 2000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .012 + + + + recurringFee + + 8 + + + + item + + + + description + + 10 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 10 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .015 + + + + recurringFee + + 10 + + + + item + + + + description + + 20 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 20 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .016 + + + + recurringFee + + 11 + + + + item + + + + description + + 25 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .017 + + + + recurringFee + + 12 + + + + item + + + + description + + 30 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 30 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .019 + + + + recurringFee + + 14 + + + + item + + + + description + + 40 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 40 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .021 + + + + recurringFee + + 16 + + + + item + + + + description + + 50 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 50 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .023 + + + + recurringFee + + 17 + + + + item + + + + description + + 75 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 75 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .025 + + + + recurringFee + + 18 + + + + item + + + + description + + 100 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .028 + + + + recurringFee + + 19 + + + + item + + + + description + + 125 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 125 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .03 + + + + recurringFee + + 20 + + + + item + + + + description + + 150 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 150 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .035 + + + + recurringFee + + 21 + + + + item + + + + description + + 175 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 175 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .04 + + + + recurringFee + + 22 + + + + item + + + + description + + 200 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 200 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 25 + + + + item + + + + description + + 250 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 250 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .06 + + + + recurringFee + + 32.5 + + + + item + + + + description + + 300 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 300 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .07 + + + + recurringFee + + 40 + + + + item + + + + description + + 350 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 350 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + 400 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 400 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + 500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .15 + + + + recurringFee + + 75 + + + + item + + + + description + + 750 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 750 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .2 + + + + recurringFee + + 100 + + + + item + + + + description + + 1,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 1000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .25 + + + + recurringFee + + 150 + + + + item + + + + description + + 1,500 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 1500 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .3 + + + + recurringFee + + 200 + + + + item + + + + description + + 2,000 GB (SAN) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 5 + + + + diskImage + + + + capacity + + 2000 + + + + + + + + + + + + + localDiskFlag + + 0 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + 25 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 0 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .01 + + + + recurringFee + + 7 + + + + item + + + + description + + 100 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 0 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .005 + + + + recurringFee + + 3.25 + + + + item + + + + description + + 25 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 25 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .01 + + + + recurringFee + + 7 + + + + item + + + + description + + 100 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 100 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .015 + + + + recurringFee + + 9 + + + + item + + + + description + + 150 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 150 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .02 + + + + recurringFee + + 14 + + + + item + + + + description + + 200 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 200 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .03 + + + + recurringFee + + 21 + + + + item + + + + description + + 300 GB (LOCAL) + + + + + + + + + + template + + + + blockDevices + + + + + + + device + + 2 + + + + diskImage + + + + capacity + + 300 + + + + + + + + + + + + + localDiskFlag + + 1 + + + + + + + + + + + + + datacenters + + + + + + + template + + + + datacenter + + + + name + + ams01 + + + + + + + + + + + + + + template + + + + datacenter + + + + name + + dal05 + + + + + + + + + + + + + + template + + + + datacenter + + + + name + + dal06 + + + + + + + + + + + + + + template + + + + datacenter + + + + name + + sea01 + + + + + + + + + + + + + + template + + + + datacenter + + + + name + + sjc01 + + + + + + + + + + + + + + template + + + + datacenter + + + + name + + sng01 + + + + + + + + + + + + + + template + + + + datacenter + + + + name + + wdc01 + + + + + + + + + + + + + + + + memory + + + + + + + itemPrice + + + + hourlyRecurringFee + + .03 + + + + recurringFee + + 21 + + + + item + + + + description + + 1 GB + + + + + + + + + + template + + + + maxMemory + + 1024 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .06 + + + + recurringFee + + 42 + + + + item + + + + description + + 2 GB + + + + + + + + + + template + + + + maxMemory + + 2048 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .085 + + + + recurringFee + + 59.5 + + + + item + + + + description + + 3 GB + + + + + + + + + + template + + + + maxMemory + + 3072 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .11 + + + + recurringFee + + 77 + + + + item + + + + description + + 4 GB + + + + + + + + + + template + + + + maxMemory + + 4096 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .14 + + + + recurringFee + + 98 + + + + item + + + + description + + 5 GB + + + + + + + + + + template + + + + maxMemory + + 5120 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .165 + + + + recurringFee + + 115.5 + + + + item + + + + description + + 6 GB + + + + + + + + + + template + + + + maxMemory + + 6144 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .195 + + + + recurringFee + + 136.5 + + + + item + + + + description + + 7 GB + + + + + + + + + + template + + + + maxMemory + + 7168 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .215 + + + + recurringFee + + 150.5 + + + + item + + + + description + + 8 GB + + + + + + + + + + template + + + + maxMemory + + 8192 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .245 + + + + recurringFee + + 171.5 + + + + item + + + + description + + 9 GB + + + + + + + + + + template + + + + maxMemory + + 9216 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .265 + + + + recurringFee + + 185.5 + + + + item + + + + description + + 10 GB + + + + + + + + + + template + + + + maxMemory + + 10240 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .29 + + + + recurringFee + + 203 + + + + item + + + + description + + 11 GB + + + + + + + + + + template + + + + maxMemory + + 11264 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .31 + + + + recurringFee + + 217 + + + + item + + + + description + + 12 GB + + + + + + + + + + template + + + + maxMemory + + 12288 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .33 + + + + recurringFee + + 231 + + + + item + + + + description + + 13 GB + + + + + + + + + + template + + + + maxMemory + + 13312 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .345 + + + + recurringFee + + 241.5 + + + + item + + + + description + + 14 GB + + + + + + + + + + template + + + + maxMemory + + 14336 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .36 + + + + recurringFee + + 252 + + + + item + + + + description + + 15 GB + + + + + + + + + + template + + + + maxMemory + + 15360 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .375 + + + + recurringFee + + 262.5 + + + + item + + + + description + + 16 GB + + + + + + + + + + template + + + + maxMemory + + 16384 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .76 + + + + recurringFee + + 525 + + + + item + + + + description + + 32 GB + + + + + + + + + + template + + + + maxMemory + + 32768 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 3.5 + + + + recurringFee + + 2500 + + + + item + + + + description + + 48 GB + + + + + + + + + + template + + + + maxMemory + + 49152 + + + + + + + + + + + + + networkComponents + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + 10 Mbps Public & Private Networks + + + + + + + + + + template + + + + networkComponents + + + + + + + maxSpeed + + 10 + + + + + + + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + 100 Mbps Private Network + + + + + + + + + + template + + + + networkComponents + + + + + + + maxSpeed + + 100 + + + + + + + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .04 + + + + recurringFee + + 20 + + + + item + + + + description + + 1 Gbps Public & Private Networks + + + + + + + + + + template + + + + networkComponents + + + + + + + maxSpeed + + 1000 + + + + + + + + + + + + + + + + + + + operatingSystems + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + CentOS 6.0 - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CENTOS_6_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + CentOS 6.0 - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CENTOS_6_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + CentOS 5 - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CENTOS_5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + CentOS 5 - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CENTOS_5_32 + + + + + + + + + + + itemPrice + + + + recurringFee + + 12 + + + + item + + + + description + + CloudLinux 6 (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CLOUDLINUX_6_64 + + + + + + + + + + + itemPrice + + + + recurringFee + + 12 + + + + item + + + + description + + CloudLinux 6 (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CLOUDLINUX_6_32 + + + + + + + + + + + itemPrice + + + + recurringFee + + 12 + + + + item + + + + description + + CloudLinux 5 (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CLOUDLINUX_5_64 + + + + + + + + + + + itemPrice + + + + recurringFee + + 12 + + + + item + + + + description + + CloudLinux 5 (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + CLOUDLINUX_5_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Debian GNU/Linux 7.0 Wheezy/Stable - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + DEBIAN_7_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Debian GNU/Linux 7.0 Wheezy/Stable - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + DEBIAN_7_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Debian GNU/Linux 6.0 Squeeze/Stable - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + DEBIAN_6_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Debian GNU/Linux 6.0 Squeeze/Stable - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + DEBIAN_6_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Debian GNU/Linux 5.0 Lenny/Stable - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + DEBIAN_5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Debian GNU/Linux 5.0 Lenny/Stable - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + DEBIAN_5_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + Red Hat Enterprise Linux 6 - Minimal Install (64 bit) (1 - 4 Core) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_6_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .12 + + + + recurringFee + + 100 + + + + item + + + + description + + Red Hat Enterprise Linux 6 - Minimal Install (64 bit) (5 - 100 Core) + + + + id + + -3839 + + + + softwareDescriptionId + + + + + + upgradeItemId + + + + + + softwareDescription + + + + controlPanel + + 0 + + + + id + + 795 + + + + longDescription + + Redhat / EL / 6.0-64 Minimal for CCI + + + + manufacturer + + Redhat + + + + name + + EL + + + + operatingSystem + + 1 + + + + referenceCode + + REDHAT_6_64 + + + + upgradeSoftwareDescriptionId + + + + + + upgradeSwDescId + + + + + + version + + 6.0-64 Minimal for CCI + + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser + + root + + + + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_6_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + Red Hat Enterprise Linux 6 - Minimal Install (32 bit) (1 - 4 Core) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_6_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .12 + + + + recurringFee + + 100 + + + + item + + + + description + + Red Hat Enterprise Linux 6 - Minimal Install (32 bit) (5 - 100 Core) + + + + id + + -3837 + + + + softwareDescriptionId + + + + + + upgradeItemId + + + + + + softwareDescription + + + + controlPanel + + 0 + + + + id + + 796 + + + + longDescription + + Redhat / EL / 6.0-32 Minimal for CCI + + + + manufacturer + + Redhat + + + + name + + EL + + + + operatingSystem + + 1 + + + + referenceCode + + REDHAT_6_32 + + + + upgradeSoftwareDescriptionId + + + + + + upgradeSwDescId + + + + + + version + + 6.0-32 Minimal for CCI + + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser + + root + + + + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_6_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + Red Hat Enterprise Linux 5 - Minimal Install (64 bit) (1 - 4 Core) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .12 + + + + recurringFee + + 100 + + + + item + + + + description + + Red Hat Enterprise Linux 5 - Minimal Install (64 bit) (5 - 100 Core) + + + + id + + -880 + + + + softwareDescriptionId + + + + + + upgradeItemId + + + + + + softwareDescription + + + + controlPanel + + 0 + + + + id + + 664 + + + + longDescription + + Redhat / EL / 5.5-64 Minimal for CCI + + + + manufacturer + + Redhat + + + + name + + EL + + + + operatingSystem + + 1 + + + + referenceCode + + REDHAT_5_64 + + + + upgradeSoftwareDescriptionId + + + + + + upgradeSwDescId + + + + + + version + + 5.5-64 Minimal for CCI + + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser + + root + + + + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .08 + + + + recurringFee + + 45 + + + + item + + + + description + + Red Hat Enterprise Linux 5 - Minimal Install (32 bit) (1 - 4 Core) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_5_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .12 + + + + recurringFee + + 100 + + + + item + + + + description + + Red Hat Enterprise Linux 5 - Minimal Install (32 bit) (5 - 100 Core) + + + + id + + -879 + + + + softwareDescriptionId + + + + + + upgradeItemId + + + + + + softwareDescription + + + + controlPanel + + 0 + + + + id + + 662 + + + + longDescription + + Redhat / EL / 5.5-32 Minimal for CCI + + + + manufacturer + + Redhat + + + + name + + EL + + + + operatingSystem + + 1 + + + + referenceCode + + REDHAT_5_32 + + + + upgradeSoftwareDescriptionId + + 927 + + + + upgradeSwDescId + + 927 + + + + version + + 5.5-32 Minimal for CCI + + + + virtualLicense + + 0 + + + + virtualizationPlatform + + 0 + + + + requiredUser + + root + + + + + + + + + + + + + template + + + + operatingSystemReferenceCode + + REDHAT_5_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Ubuntu Linux 12.04 LTS Precise Pangolin - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + UBUNTU_12_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Ubuntu Linux 12.04 LTS Precise Pangolin - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + UBUNTU_12_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Ubuntu Linux 10.04 LTS Lucid Lynx - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + UBUNTU_10_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Ubuntu Linux 10.04 LTS Lucid Lynx - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + UBUNTU_10_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Ubuntu Linux 8 LTS Hardy Heron - Minimal Install (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + UBUNTU_8_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Ubuntu Linux 8 LTS Hardy Heron - Minimal Install (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + UBUNTU_8_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Vyatta 6.6 Community Edition (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + VYATTACE_6.6_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + 0 + + + + recurringFee + + 0 + + + + item + + + + description + + Vyatta 6.5 Community Edition (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + VYATTACE_6.5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2012 Standard Edition (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2012-STD_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2012 Datacenter Edition (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2012-DC_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2008 Standard Edition SP2 (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-STD-SP2_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2008 Standard Edition SP2 (32bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-STD-SP2_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2008 Standard SP1 with R2 (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-STD-R2-SP1_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2008 R2 Standard Edition (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-STD-R2_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + Windows Server 2008 Enterprise Edition SP2 (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-ENT-SP2_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + Windows Server 2008 Enterprise Edition SP2 (32bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-ENT-SP2_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .1 + + + + recurringFee + + 50 + + + + item + + + + description + + Windows Server 2008 R2 Enterprise Edition (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-ENT-R2_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2008 Datacenter Edition SP2 (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-DC-SP2_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2008 R2 Datacenter Edition (64bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2008-DC-R2_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2003 Standard SP2 with R2 (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2003-STD-SP2-5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2003 Standard SP2 with R2 (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2003-STD-SP2-5_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 50 + + + + item + + + + description + + Windows Server 2003 Enterprise SP2 with R2 (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2003-ENT-SP2-5_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 50 + + + + item + + + + description + + Windows Server 2003 Enterprise SP2 with R2 (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2003-ENT-SP2-5_32 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2003 Datacenter SP2 with R2 (64 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2003-DC-SP2-1_64 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .05 + + + + recurringFee + + 20 + + + + item + + + + description + + Windows Server 2003 Datacenter SP2 with R2 (32 bit) + + + + + + + + + + template + + + + operatingSystemReferenceCode + + WIN_2003-DC-SP2-1_32 + + + + + + + + + + + + + processors + + + + + + + itemPrice + + + + hourlyRecurringFee + + .07 + + + + recurringFee + + 29 + + + + item + + + + description + + 1 x 2.0 GHz Core + + + + + + + + + + template + + + + startCpus + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .14 + + + + recurringFee + + 78 + + + + item + + + + description + + 2 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 2 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .205 + + + + recurringFee + + 123.5 + + + + item + + + + description + + 3 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 3 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .265 + + + + recurringFee + + 165.5 + + + + item + + + + description + + 4 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 4 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .325 + + + + recurringFee + + 207.5 + + + + item + + + + description + + 5 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 5 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .39 + + + + recurringFee + + 253 + + + + item + + + + description + + 6 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 6 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .445 + + + + recurringFee + + 291.5 + + + + item + + + + description + + 7 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 7 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .495 + + + + recurringFee + + 326.5 + + + + item + + + + description + + 8 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 8 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .54 + + + + recurringFee + + 358 + + + + item + + + + description + + 9 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 9 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .59 + + + + recurringFee + + 393 + + + + item + + + + description + + 10 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 10 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .635 + + + + recurringFee + + 424.5 + + + + item + + + + description + + 11 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 11 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .66 + + + + recurringFee + + 442 + + + + item + + + + description + + 12 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 12 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .695 + + + + recurringFee + + 466.5 + + + + item + + + + description + + 13 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 13 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .72 + + + + recurringFee + + 484 + + + + item + + + + description + + 14 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 14 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .74 + + + + recurringFee + + 498 + + + + item + + + + description + + 15 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 15 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .75 + + + + recurringFee + + 505 + + + + item + + + + description + + 16 x 2.0 GHz Cores + + + + + + + + + + template + + + + startCpus + + 16 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .22 + + + + recurringFee + + 159 + + + + item + + + + description + + Private 1 x 2.0 GHz Core + + + + + + + + + + template + + + + dedicatedAccountHostOnlyFlag + + 1 + + + + startCpus + + 1 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .3 + + + + recurringFee + + 199 + + + + item + + + + description + + Private 2 x 2.0 GHz Cores + + + + + + + + + + template + + + + dedicatedAccountHostOnlyFlag + + 1 + + + + startCpus + + 2 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .44 + + + + recurringFee + + 299 + + + + item + + + + description + + Private 4 x 2.0 GHz Cores + + + + + + + + + + template + + + + dedicatedAccountHostOnlyFlag + + 1 + + + + startCpus + + 4 + + + + + + + + + + + itemPrice + + + + hourlyRecurringFee + + .58 + + + + recurringFee + + 399 + + + + item + + + + description + + Private 8 x 2.0 GHz Cores + + + + + + + + + + template + + + + dedicatedAccountHostOnlyFlag + + 1 + + + + startCpus + + 8 @@ -64,4 +12524,4 @@ - \ No newline at end of file + diff --git a/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getObject.xml b/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getObject.xml index 868c49f..cf84f2a 100644 --- a/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getObject.xml +++ b/libcloud/test/compute/fixtures/softlayer/v3__SoftLayer_Virtual_Guest_getObject.xml @@ -6,13 +6,13 @@ accountId - 12345 + 282402 createDate - 2013-01-01T19:31:22-06:00 + 2013-11-12T19:33:57+01:00 @@ -24,31 +24,31 @@ domain - domain.com + example.com fullyQualifiedDomainName - hostname.domain.com + libcloud-testing.example.com hostname - hostname + libcloud-testing id - 123456 + 2905761 lastPowerStateId - 1 + @@ -60,7 +60,7 @@ maxCpu - 2 + 1 @@ -84,19 +84,13 @@ modifyDate - 2013-01-01T19:36:47-06:00 - - - - privateNetworkOnlyFlag - - 0 + 2013-11-12T19:36:55+01:00 startCpus - 2 + 1 @@ -108,7 +102,7 @@ uuid - f47ac10b-58cc-4372-a567-0e02b2c3d479 + cbc33604-afd0-4820-57c3-6c68ae7c5fe0 @@ -136,43 +130,43 @@ createDate - 2013-01-01T19:31:26-06:00 + 2013-11-12T19:33:59+01:00 currentHourlyCharge - 0 + .056 cycleStartDate - 2013-01-01T19:38:00-06:00 + 2013-11-12T19:39:03+01:00 description - 2 x 2.0 GHz Cores + 1 x 2.0 GHz Core domainName - domain.com + example.com hostName - hostname + libcloud-testing hourlyRecurringFee - 0 + .056 @@ -184,7 +178,7 @@ id - 12345678 + 16538495 @@ -196,25 +190,25 @@ laborFeeTaxRate - .066 + .21 lastBillDate - 2013-01-01T19:38:00-06:00 + 2013-11-12T19:39:03+01:00 modifyDate - 2013-01-01T19:38:00-06:00 + 2013-11-12T19:39:03+01:00 nextBillDate - 2013-01-19T00:00:00-06:00 + 2013-11-28T07:00:00+01:00 @@ -226,13 +220,13 @@ oneTimeFeeTaxRate - .066 + .21 orderItemId - 98765 + 22774406 @@ -244,13 +238,13 @@ recurringFee - 0 + .056 recurringFeeTaxRate - .066 + .21 @@ -274,13 +268,13 @@ setupFeeTaxRate - .066 + .21 resourceTableId - 1412553 + 2905761 @@ -289,7 +283,7 @@ globalIdentifier - f47ac10b-58cc-4372-a567-0e02b2c3d479 + 633fd9e3-4cf7-4c78-b746-c2b76e2c8b88 @@ -311,7 +305,7 @@ id - 12345 + 2211183 @@ -330,25 +324,25 @@ createDate - 2013-01-01T19:33:12-06:00 + 2013-11-12T19:34:16+01:00 id - 12345 + 1867597 modifyDate - 2013-01-01T19:33:12-06:00 + 2013-11-12T19:34:16+01:00 password - abczyx + LTSp4cpJ @@ -360,7 +354,7 @@ softwareId - 1809157 + 2211183 @@ -382,13 +376,13 @@ id - 1104 + 1523 softwareDescriptionId - 1025 + 1163 @@ -404,19 +398,25 @@ id - 1025 + 1163 + + + + longDescription + + Debian / Debian / 7.0.0-64 Minimal for CCI manufacturer - Ubuntu + Debian name - Ubuntu + Debian @@ -428,13 +428,7 @@ referenceCode - UBUNTU_12_64 - - - - requiredUser - - root + DEBIAN_7_64 @@ -452,7 +446,7 @@ version - 12.04-64 Minimal for CCI + 7.0.0-64 Minimal for CCI @@ -467,6 +461,12 @@ 0 + + requiredUser + + root + + @@ -498,22 +498,22 @@ primaryBackendIpAddress - 10.80.10.10 + 10.55.62.124 primaryIpAddress - 173.193.10.10 + 50.97.215.202 provisionDate - 2013-01-01T19:38:01-06:00 + 2013-11-12T19:39:03+01:00 - + diff --git a/libcloud/test/compute/test_softlayer.py b/libcloud/test/compute/test_softlayer.py index 203f25f..92a614d 100644 --- a/libcloud/test/compute/test_softlayer.py +++ b/libcloud/test/compute/test_softlayer.py @@ -23,11 +23,12 @@ from libcloud.utils.py3 import xmlrpclib from libcloud.utils.py3 import next from libcloud.compute.drivers.softlayer import SoftLayerNodeDriver as SoftLayer -from libcloud.compute.drivers.softlayer import SoftLayerException +from libcloud.compute.drivers.softlayer import SoftLayerException, \ + NODE_STATE_MAP from libcloud.compute.types import NodeState from libcloud.test import MockHttp # pylint: disable-msg=E0611 -from libcloud.test.file_fixtures import ComputeFileFixtures # pylint: disable-msg=E0611 +from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.test.secrets import SOFTLAYER_PARAMS @@ -40,17 +41,23 @@ class SoftLayerTests(unittest.TestCase): self.driver = SoftLayer(*SOFTLAYER_PARAMS) def test_list_nodes(self): - node = self.driver.list_nodes()[0] - self.assertEqual(node.name, 'test1') + nodes = self.driver.list_nodes() + node = nodes[0] + self.assertEqual(node.name, 'libcloud-testing1') self.assertEqual(node.state, NodeState.RUNNING) - self.assertEqual(node.extra['password'], 'TEST') + self.assertEqual(node.extra['password'], 'L3TJVubf') + + def test_initializing_state(self): + nodes = self.driver.list_nodes() + node = nodes[1] + self.assertEqual(node.state, NODE_STATE_MAP['INITIATING']) def test_list_locations(self): locations = self.driver.list_locations() dal = next(l for l in locations if l.id == 'dal05') self.assertEqual(dal.country, 'US') self.assertEqual(dal.id, 'dal05') - self.assertEqual(dal.name, 'Dallas 5') + self.assertEqual(dal.name, 'Dallas - Central U.S.') def test_list_images(self): images = self.driver.list_images() @@ -59,15 +66,15 @@ class SoftLayerTests(unittest.TestCase): def test_list_sizes(self): sizes = self.driver.list_sizes() - self.assertEqual(len(sizes), 10) - size = [s for s in sizes if s.id == 'sl2_local_disk'] - self.assertEqual(len(size), 1) + self.assertEqual(len(sizes), 13) def test_create_node(self): - self.driver.create_node(name="Test", + node = self.driver.create_node(name="libcloud-testing", location=self.driver.list_locations()[0], size=self.driver.list_sizes()[0], image=self.driver.list_images()[0]) + self.assertEqual(node.name, 'libcloud-testing') + self.assertEqual(node.state, NODE_STATE_MAP['RUNNING']) def test_create_fail(self): SoftLayerMockHttp.type = "SOFTLAYEREXCEPTION" @@ -98,8 +105,7 @@ class SoftLayerTests(unittest.TestCase): self.driver.create_node(name="Test", size=self.driver.list_sizes()[0]) def test_create_node_san(self): - size = [s for s in self.driver.list_sizes() if 'san' in s.id][0] - self.driver.create_node(name="Test", size=size) + self.driver.create_node(name="Test", ex_local_disk=False) def test_create_node_domain_for_name(self): self.driver.create_node(name="libcloud.org") -- 1.7.10.4