Binary files ./libcloud/.git/index and libcloud_vcl/.git/index differ diff -crBN ./libcloud/.git/logs/HEAD libcloud_vcl/.git/logs/HEAD *** ./libcloud/.git/logs/HEAD 2012-04-11 15:56:09.000000000 -0400 --- libcloud_vcl/.git/logs/HEAD 2012-04-11 10:54:59.000000000 -0400 *************** *** 1 **** ! 0000000000000000000000000000000000000000 941fb0d6fe51e7ad00b85428173babc0cc1342da root 1334174169 -0400 clone: from https://github.com/apache/libcloud.git --- 1 ---- ! 0000000000000000000000000000000000000000 941fb0d6fe51e7ad00b85428173babc0cc1342da root 1334156099 -0400 clone: from https://github.com/apache/libcloud.git diff -crBN ./libcloud/.git/logs/refs/heads/trunk libcloud_vcl/.git/logs/refs/heads/trunk *** ./libcloud/.git/logs/refs/heads/trunk 2012-04-11 15:56:09.000000000 -0400 --- libcloud_vcl/.git/logs/refs/heads/trunk 2012-04-11 10:54:59.000000000 -0400 *************** *** 1 **** ! 0000000000000000000000000000000000000000 941fb0d6fe51e7ad00b85428173babc0cc1342da root 1334174169 -0400 clone: from https://github.com/apache/libcloud.git --- 1 ---- ! 0000000000000000000000000000000000000000 941fb0d6fe51e7ad00b85428173babc0cc1342da root 1334156099 -0400 clone: from https://github.com/apache/libcloud.git Binary files ./libcloud/.git/objects/pack/pack-e364b95847cad89f8b7b9906320244f674ffe63d.idx and libcloud_vcl/.git/objects/pack/pack-e364b95847cad89f8b7b9906320244f674ffe63d.idx differ Binary files ./libcloud/.git/objects/pack/pack-e364b95847cad89f8b7b9906320244f674ffe63d.pack and libcloud_vcl/.git/objects/pack/pack-e364b95847cad89f8b7b9906320244f674ffe63d.pack differ Binary files ./libcloud/libcloud/common/aws.pyc and libcloud_vcl/libcloud/common/aws.pyc differ Binary files ./libcloud/libcloud/common/base.pyc and libcloud_vcl/libcloud/common/base.pyc differ Binary files ./libcloud/libcloud/common/brightbox.pyc and libcloud_vcl/libcloud/common/brightbox.pyc differ Binary files ./libcloud/libcloud/common/cloudstack.pyc and libcloud_vcl/libcloud/common/cloudstack.pyc differ Binary files ./libcloud/libcloud/common/gandi.pyc and libcloud_vcl/libcloud/common/gandi.pyc differ Binary files ./libcloud/libcloud/common/gogrid.pyc and libcloud_vcl/libcloud/common/gogrid.pyc differ Binary files ./libcloud/libcloud/common/__init__.pyc and libcloud_vcl/libcloud/common/__init__.pyc differ Binary files ./libcloud/libcloud/common/linode.pyc and libcloud_vcl/libcloud/common/linode.pyc differ Binary files ./libcloud/libcloud/common/openstack.pyc and libcloud_vcl/libcloud/common/openstack.pyc differ Binary files ./libcloud/libcloud/common/rackspace.pyc and libcloud_vcl/libcloud/common/rackspace.pyc differ Binary files ./libcloud/libcloud/common/types.pyc and libcloud_vcl/libcloud/common/types.pyc differ Binary files ./libcloud/libcloud/compute/base.pyc and libcloud_vcl/libcloud/compute/base.pyc differ Binary files ./libcloud/libcloud/compute/deployment.pyc and libcloud_vcl/libcloud/compute/deployment.pyc differ Binary files ./libcloud/libcloud/compute/drivers/bluebox.pyc and libcloud_vcl/libcloud/compute/drivers/bluebox.pyc differ Binary files ./libcloud/libcloud/compute/drivers/brightbox.pyc and libcloud_vcl/libcloud/compute/drivers/brightbox.pyc differ Binary files ./libcloud/libcloud/compute/drivers/cloudsigma.pyc and libcloud_vcl/libcloud/compute/drivers/cloudsigma.pyc differ Binary files ./libcloud/libcloud/compute/drivers/cloudstack.pyc and libcloud_vcl/libcloud/compute/drivers/cloudstack.pyc differ Binary files ./libcloud/libcloud/compute/drivers/dreamhost.pyc and libcloud_vcl/libcloud/compute/drivers/dreamhost.pyc differ Binary files ./libcloud/libcloud/compute/drivers/dummy.pyc and libcloud_vcl/libcloud/compute/drivers/dummy.pyc differ Binary files ./libcloud/libcloud/compute/drivers/ec2.pyc and libcloud_vcl/libcloud/compute/drivers/ec2.pyc differ Binary files ./libcloud/libcloud/compute/drivers/ecp.pyc and libcloud_vcl/libcloud/compute/drivers/ecp.pyc differ Binary files ./libcloud/libcloud/compute/drivers/elastichosts.pyc and libcloud_vcl/libcloud/compute/drivers/elastichosts.pyc differ Binary files ./libcloud/libcloud/compute/drivers/elasticstack.pyc and libcloud_vcl/libcloud/compute/drivers/elasticstack.pyc differ Binary files ./libcloud/libcloud/compute/drivers/gandi.pyc and libcloud_vcl/libcloud/compute/drivers/gandi.pyc differ Binary files ./libcloud/libcloud/compute/drivers/gogrid.pyc and libcloud_vcl/libcloud/compute/drivers/gogrid.pyc differ Binary files ./libcloud/libcloud/compute/drivers/ibm_sbc.pyc and libcloud_vcl/libcloud/compute/drivers/ibm_sbc.pyc differ Binary files ./libcloud/libcloud/compute/drivers/__init__.pyc and libcloud_vcl/libcloud/compute/drivers/__init__.pyc differ Binary files ./libcloud/libcloud/compute/drivers/joyent.pyc and libcloud_vcl/libcloud/compute/drivers/joyent.pyc differ Binary files ./libcloud/libcloud/compute/drivers/linode.pyc and libcloud_vcl/libcloud/compute/drivers/linode.pyc differ Binary files ./libcloud/libcloud/compute/drivers/opennebula.pyc and libcloud_vcl/libcloud/compute/drivers/opennebula.pyc differ Binary files ./libcloud/libcloud/compute/drivers/openstack.pyc and libcloud_vcl/libcloud/compute/drivers/openstack.pyc differ Binary files ./libcloud/libcloud/compute/drivers/opsource.pyc and libcloud_vcl/libcloud/compute/drivers/opsource.pyc differ Binary files ./libcloud/libcloud/compute/drivers/rackspacenova.pyc and libcloud_vcl/libcloud/compute/drivers/rackspacenova.pyc differ Binary files ./libcloud/libcloud/compute/drivers/rackspace.pyc and libcloud_vcl/libcloud/compute/drivers/rackspace.pyc differ Binary files ./libcloud/libcloud/compute/drivers/rimuhosting.pyc and libcloud_vcl/libcloud/compute/drivers/rimuhosting.pyc differ Binary files ./libcloud/libcloud/compute/drivers/serverlove.pyc and libcloud_vcl/libcloud/compute/drivers/serverlove.pyc differ Binary files ./libcloud/libcloud/compute/drivers/skalicloud.pyc and libcloud_vcl/libcloud/compute/drivers/skalicloud.pyc differ Binary files ./libcloud/libcloud/compute/drivers/slicehost.pyc and libcloud_vcl/libcloud/compute/drivers/slicehost.pyc differ Binary files ./libcloud/libcloud/compute/drivers/softlayer.pyc and libcloud_vcl/libcloud/compute/drivers/softlayer.pyc differ Binary files ./libcloud/libcloud/compute/drivers/vcloud.pyc and libcloud_vcl/libcloud/compute/drivers/vcloud.pyc differ diff -crBN ./libcloud/libcloud/compute/drivers/vcl.py libcloud_vcl/libcloud/compute/drivers/vcl.py *** ./libcloud/libcloud/compute/drivers/vcl.py 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/libcloud/compute/drivers/vcl.py 2012-04-11 16:11:24.000000000 -0400 *************** *** 0 **** --- 1,342 ---- + # Licensed to the Apache Software Foundation (ASF) under one or more + # contributor license agreements. See the NOTICE file distributed with + # this work for additional information regarding copyright ownership. + # The ASF licenses this file to You under the Apache License, Version 2.0 + # (the "License"); you may not use this file except in compliance with + # the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + """ + VCL driver + """ + + import time + + import libcloud + import sys + from libcloud.utils.py3 import xmlrpclib + + from libcloud.common.types import InvalidCredsError, LibcloudError + from libcloud.compute.types import Provider, NodeState + from libcloud.compute.base import NodeDriver, Node + from libcloud.compute.base import NodeLocation, NodeSize, NodeImage + + + class VCLException(LibcloudError): + """ + Exception class for VCL driver + """ + pass + + + class VCLSafeTransport(xmlrpclib.SafeTransport): + def __init__(self, datetime, user, passwd, host): + self._user = user + self._pass = passwd + self._use_datetime = datetime + self._connection = (None, None) + self._extra_headers = [] + + def send_content(self, connection, request_body): + connection.putheader("Content-Type", "text/xml") + connection.putheader('X-APIVERSION', '2') + connection.putheader('X-User', self._user) + connection.putheader('X-Pass', self._pass) + connection.putheader("Content-Length", str(len(request_body))) + connection.endheaders(request_body) + + + class VCLProxy(xmlrpclib.ServerProxy): + API_POSTFIX = '/index.php?mode=xmlrpccall' + transportCls = VCLSafeTransport + + def __init__(self, user_agent, user, keys, host, verbose=0): + cls = self.transportCls + if host[:8] != "https://": + raise VCLException('VCL connection requires HTTPS', drive=self) + self.API = host + VCLProxy.API_POSTFIX + t = cls(0, user, keys, self.API) + t.user_agent = user_agent + + xmlrpclib.ServerProxy.__init__( + self, + uri="%s" % (self.API), + transport=t, + verbose=verbose + ) + + + class VCLConnection(object): + """ + Connection class for the VCL driver + """ + + proxyCls = VCLProxy + driver = None + + def __init__(self, user, key, host): + self.user = user + self.key = key + self.host = host + self.ua = [] + + def request(self, method, *args, **kwargs): + sl = self.proxyCls(self._user_agent(), + self.user, self.key, host=self.host) + try: + return getattr(sl, method)(*args) + except xmlrpclib.Fault: + e = sys.exc_info()[1] + if e.faultCode == "VCL_Account": + raise InvalidCredsError(e.faultString) + raise VCLException(e) + + def _user_agent(self): + return 'libcloud/%s (%s)%s' % ( + libcloud.__version__, + self.driver.name, + "".join([" (%s)" % x for x in self.ua])) + + def user_agent_append(self, s): + self.ua.append(s) + + + class VCLNodeDriver(NodeDriver): + """ + VCL node driver + + @keyword: host: The VCL host to which you make requests(required) + @type: host: C{string} + """ + + NODE_STATE_MAP = { + 'ready': NodeState.RUNNING, + 'failed': NodeState.TERMINATED, + 'timedout': NodeState.TERMINATED, + 'loading': NodeState.PENDING, + 'time': NodeState.PENDING, + 'future': NodeState.PENDING, + 'error': NodeState.UNKNOWN, + 'notready': NodeState.PENDING, + 'notavailable': NodeState.TERMINATED, + 'success': NodeState.PENDING + } + + connectionCls = VCLConnection + name = 'VCL' + type = Provider.VCL + + def __init__(self, key, secret, + secure=True, host=None, + path=None, port=None, *args, **kwargs): + + if host is not None: + self.host = host + + if (self.type == Provider.VCL) and (not host): + raise Exception('When instantiating VCL driver directly ' + + 'you also need to provide host') + + self.key = key + self.secret = secret + self.connection = self.connectionCls(key, secret, host) + self.connection.driver = self + + def _vcl_request(self, method, *args): + res = self.connection.request( + method, + *args + ) + if(res['status'] == 'error'): + raise VCLException(res['errormsg']) + return res + + def create_node(self, **kwargs): + """Create a new VCL reservation + + See L{NodeDriver.create_node} for more keyword args. + size and name ignored, image is the id from list_images + @keyword start: start time as unix timestamp + @type start: C{string} + + @keyword length: length of time in minutes + @type length: C{string} + """ + + image = kwargs["image"] + start = kwargs.get('start', int(time.time())) + length = kwargs.get('length', '60') + + res = self._vcl_request( + "XMLRPCaddRequest", + image.id, + start, + length + ) + + return Node( + id=res['requestid'], + name=image.name, + state=self.NODE_STATE_MAP[res['status']], + public_ips=[], + private_ips=[], + driver=self, + image=image.name + ) + + def destroy_node(self, node): + """ + End VCL reservation for the node passed in. + Throws error if request fails. + """ + try: + res = self._vcl_request( + "XMLRPCendRequest", + node.id + ) + except VCLException: + return False + return True + + def _to_image(self, img): + return NodeImage( + id=img['id'], + name=img['name'], + driver=self.connection.driver + ) + + def list_images(self, location=None): + """ + List images available to the user provided credentials + """ + res = self.connection.request( + "XMLRPCgetImages" + ) + return [self._to_image(i) for i in res] + + def list_sizes(self, location=None): + """ + VCL does not choosing sizes for node creation. + Size of images are statically set by administrators. + """ + return [NodeSize( + 't1.micro', + 'none', + '512', + 0, 0, 0, self) + ] + + def _to_connect_data(self, request_id, ipaddr): + res = self._vcl_request( + "XMLRPCgetRequestConnectData", + request_id, + ipaddr + ) + return res + + def _to_status(self, requestid, imagename, ipaddr): + res = self._vcl_request( + "XMLRPCgetRequestStatus", + requestid + ) + + public_ips = [] + extra = [] + if(res['status'] == 'ready'): + cdata = self._to_connect_data(requestid, ipaddr) + public_ips = [cdata['serverIP']] + extra = { + 'user': cdata['user'], + 'pass': cdata['password'] + } + return Node( + id=requestid, + name=imagename, + state=self.NODE_STATE_MAP[res['status']], + public_ips=public_ips, + private_ips=[], + driver=self, + image=imagename, + extra=extra + ) + + def _to_nodes(self, res, ipaddr): + return [self._to_status( + h['requestid'], + h['imagename'], + ipaddr + ) for h in res] + + def list_nodes(self, ipaddr): + res = self._vcl_request( + "XMLRPCgetRequestIds" + ) + return self._to_nodes(res['requests'], ipaddr) + + def reboot_node(self, node): + """ + VCL does not support the rebooting of nodes + """ + raise VCLException("Rebooting node is not supported by VCL") + + def list_locations(self): + """ + VCL does not allows users to configure node locations + """ + raise VCLException("VCL does not support locations") + + def ex_update_node_access(self, node, ipaddr): + """ + Update the remote ip accessing the node. + + @param: node: the reservation node to update + @type: node: Node object + + @param: ipaddr: the ipaddr used to access the node + @type: ipaddr: C{string} + + @return: node with updated information + """ + return self._to_status(node.id, node.image, ipaddr) + + def ex_extend_request_time(self, node, minutes): + """ + Time in minutes to extend the requested node's reservation time + + @param: node: the reservation node to update + @type: node: Node object + + @param: minutes: the number of mintes to update + @type: minutes: C{string} + + @return: true on success, throws error on failure + """ + return self._vcl_request( + "XMLRPCextendRequest", + node.id, + minutes + ) + + def ex_get_request_end_time(self, node): + """ + Get the ending time of the node reservation. + + @param: node: the reservation node to update + @type: node: Node object + + @return: unix timestamp + """ + res = self._vcl_request( + "XMLRPCgetRequestIds" + ) + time = 0 + for i in res['requests']: + if i['requestid'] == node.id: + time = i['end'] + return time Binary files ./libcloud/libcloud/compute/drivers/vcl.pyc and libcloud_vcl/libcloud/compute/drivers/vcl.pyc differ Binary files ./libcloud/libcloud/compute/drivers/voxel.pyc and libcloud_vcl/libcloud/compute/drivers/voxel.pyc differ Binary files ./libcloud/libcloud/compute/drivers/vpsnet.pyc and libcloud_vcl/libcloud/compute/drivers/vpsnet.pyc differ Binary files ./libcloud/libcloud/compute/__init__.pyc and libcloud_vcl/libcloud/compute/__init__.pyc differ diff -crBN ./libcloud/libcloud/compute/providers.py libcloud_vcl/libcloud/compute/providers.py *** ./libcloud/libcloud/compute/providers.py 2012-04-11 15:56:09.000000000 -0400 --- libcloud_vcl/libcloud/compute/providers.py 2012-04-11 12:58:21.000000000 -0400 *************** *** 112,118 **** Provider.LIBVIRT: ('libcloud.compute.drivers.libvirt_driver', 'LibvirtNodeDriver'), Provider.JOYENT: ! ('libcloud.compute.drivers.joyent', 'JoyentNodeDriver') } --- 112,121 ---- Provider.LIBVIRT: ('libcloud.compute.drivers.libvirt_driver', 'LibvirtNodeDriver'), Provider.JOYENT: ! ('libcloud.compute.drivers.joyent', 'JoyentNodeDriver'), ! Provider.VCL: ! ('libcloud.compute.drivers.vcl', 'VCLNodeDriver') ! } Binary files ./libcloud/libcloud/compute/providers.pyc and libcloud_vcl/libcloud/compute/providers.pyc differ Binary files ./libcloud/libcloud/compute/ssh.pyc and libcloud_vcl/libcloud/compute/ssh.pyc differ diff -crBN ./libcloud/libcloud/compute/types.py libcloud_vcl/libcloud/compute/types.py *** ./libcloud/libcloud/compute/types.py 2012-04-11 15:56:09.000000000 -0400 --- libcloud_vcl/libcloud/compute/types.py 2012-04-11 11:20:52.000000000 -0400 *************** *** 64,69 **** --- 64,70 ---- @cvar RACKSPACE_NOVA_BETA: Rackspace Nova Private Beta (ORD) @cvar LIBVIRT: Libvirt driver @cvar JOYENT: Joyent driver + @cvar VCL: VCL driver """ DUMMY = 0 EC2 = 1 # deprecated name *************** *** 113,118 **** --- 114,120 ---- ELASTICHOSTS_US2 = 43 ELASTICHOSTS_CA1 = 44 JOYENT = 45 + VCL = 46 class NodeState(object): Binary files ./libcloud/libcloud/compute/types.pyc and libcloud_vcl/libcloud/compute/types.pyc differ Binary files ./libcloud/libcloud/dns/base.pyc and libcloud_vcl/libcloud/dns/base.pyc differ Binary files ./libcloud/libcloud/dns/drivers/dummy.pyc and libcloud_vcl/libcloud/dns/drivers/dummy.pyc differ Binary files ./libcloud/libcloud/dns/drivers/__init__.pyc and libcloud_vcl/libcloud/dns/drivers/__init__.pyc differ Binary files ./libcloud/libcloud/dns/drivers/linode.pyc and libcloud_vcl/libcloud/dns/drivers/linode.pyc differ Binary files ./libcloud/libcloud/dns/drivers/rackspace.pyc and libcloud_vcl/libcloud/dns/drivers/rackspace.pyc differ Binary files ./libcloud/libcloud/dns/drivers/zerigo.pyc and libcloud_vcl/libcloud/dns/drivers/zerigo.pyc differ Binary files ./libcloud/libcloud/dns/__init__.pyc and libcloud_vcl/libcloud/dns/__init__.pyc differ Binary files ./libcloud/libcloud/dns/types.pyc and libcloud_vcl/libcloud/dns/types.pyc differ Binary files ./libcloud/libcloud/httplib_ssl.pyc and libcloud_vcl/libcloud/httplib_ssl.pyc differ Binary files ./libcloud/libcloud/__init__.pyc and libcloud_vcl/libcloud/__init__.pyc differ Binary files ./libcloud/libcloud/loadbalancer/base.pyc and libcloud_vcl/libcloud/loadbalancer/base.pyc differ Binary files ./libcloud/libcloud/loadbalancer/drivers/brightbox.pyc and libcloud_vcl/libcloud/loadbalancer/drivers/brightbox.pyc differ Binary files ./libcloud/libcloud/loadbalancer/drivers/cloudstack.pyc and libcloud_vcl/libcloud/loadbalancer/drivers/cloudstack.pyc differ Binary files ./libcloud/libcloud/loadbalancer/drivers/gogrid.pyc and libcloud_vcl/libcloud/loadbalancer/drivers/gogrid.pyc differ Binary files ./libcloud/libcloud/loadbalancer/drivers/__init__.pyc and libcloud_vcl/libcloud/loadbalancer/drivers/__init__.pyc differ Binary files ./libcloud/libcloud/loadbalancer/drivers/rackspace.pyc and libcloud_vcl/libcloud/loadbalancer/drivers/rackspace.pyc differ Binary files ./libcloud/libcloud/loadbalancer/__init__.pyc and libcloud_vcl/libcloud/loadbalancer/__init__.pyc differ Binary files ./libcloud/libcloud/loadbalancer/types.pyc and libcloud_vcl/libcloud/loadbalancer/types.pyc differ Binary files ./libcloud/libcloud/pricing.pyc and libcloud_vcl/libcloud/pricing.pyc differ Binary files ./libcloud/libcloud/security.pyc and libcloud_vcl/libcloud/security.pyc differ Binary files ./libcloud/libcloud/storage/base.pyc and libcloud_vcl/libcloud/storage/base.pyc differ Binary files ./libcloud/libcloud/storage/drivers/atmos.pyc and libcloud_vcl/libcloud/storage/drivers/atmos.pyc differ Binary files ./libcloud/libcloud/storage/drivers/cloudfiles.pyc and libcloud_vcl/libcloud/storage/drivers/cloudfiles.pyc differ Binary files ./libcloud/libcloud/storage/drivers/dummy.pyc and libcloud_vcl/libcloud/storage/drivers/dummy.pyc differ Binary files ./libcloud/libcloud/storage/drivers/google_storage.pyc and libcloud_vcl/libcloud/storage/drivers/google_storage.pyc differ Binary files ./libcloud/libcloud/storage/drivers/__init__.pyc and libcloud_vcl/libcloud/storage/drivers/__init__.pyc differ Binary files ./libcloud/libcloud/storage/drivers/s3.pyc and libcloud_vcl/libcloud/storage/drivers/s3.pyc differ Binary files ./libcloud/libcloud/storage/__init__.pyc and libcloud_vcl/libcloud/storage/__init__.pyc differ Binary files ./libcloud/libcloud/storage/providers.pyc and libcloud_vcl/libcloud/storage/providers.pyc differ Binary files ./libcloud/libcloud/storage/types.pyc and libcloud_vcl/libcloud/storage/types.pyc differ Binary files ./libcloud/libcloud/utils/compression.pyc and libcloud_vcl/libcloud/utils/compression.pyc differ Binary files ./libcloud/libcloud/utils/files.pyc and libcloud_vcl/libcloud/utils/files.pyc differ Binary files ./libcloud/libcloud/utils/__init__.pyc and libcloud_vcl/libcloud/utils/__init__.pyc differ Binary files ./libcloud/libcloud/utils/misc.pyc and libcloud_vcl/libcloud/utils/misc.pyc differ Binary files ./libcloud/libcloud/utils/py3.pyc and libcloud_vcl/libcloud/utils/py3.pyc differ Binary files ./libcloud/libcloud/utils/xml.pyc and libcloud_vcl/libcloud/utils/xml.pyc differ Binary files ./libcloud/test/common/__init__.pyc and libcloud_vcl/test/common/__init__.pyc differ Binary files ./libcloud/test/common/test_cloudstack.pyc and libcloud_vcl/test/common/test_cloudstack.pyc differ diff -crBN ./libcloud/test/compute/fixtures/vcl/v3_SoftLayer_Account_getVirtualGuests.xml libcloud_vcl/test/compute/fixtures/vcl/v3_SoftLayer_Account_getVirtualGuests.xml *** ./libcloud/test/compute/fixtures/vcl/v3_SoftLayer_Account_getVirtualGuests.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/v3_SoftLayer_Account_getVirtualGuests.xml 2012-04-11 13:23:40.000000000 -0400 *************** *** 0 **** --- 1,1066 ---- + + + + + + + + + + privateNetworkOnlyFlag + + 0 + + + + id + + 1832 + + + + accountId + + 11111 + + + + statusId + + 1001 + + + + uuid + + eaa9aaa2-8e2e-d6e0-ce11-6f01e765779c + + + + hostname + + test1 + + + + domain + + libcloud.org + + + + maxCpu + + 2 + + + + maxCpuUnits + + CORE + + + + maxMemory + + 2048 + + + + startCpus + + 2 + + + + createDate + + 2009-09-04T14:49:45-05:00 + + + + modifyDate + + 2010-04-22T13:08:47-05:00 + + + + metricPollDate + + 2010-04-22T13:08:00-05:00 + + + + dedicatedAccountHostOnlyFlag + + 0 + + + + powerState + + + + name + + Running + + + + keyName + + RUNNING + + + + + + + softwareComponents + + + + + + + id + + 191115 + + + + hardwareId + + + + + + manufacturerLicenseInstance + + + + + + passwords + + + + + + + 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 + + + + + + + + + + + + + + + + + + primaryIpAddress + + 67.254.254.254 + + + + primaryBackendIpAddress + + 10.254.254.254 + + + + + + + + privateNetworkOnlyFlag + + 0 + + + + id + + 13402 + + + + accountId + + 11111 + + + + statusId + + 1001 + + + + uuid + + 9e9e9e99-4ed9-4645-19f3-55ee4e404d56 + + + + hostname + + test2 + + + + domain + + libcloud.org + + + + maxCpu + + 1 + + + + maxCpuUnits + + CORE + + + + maxMemory + + 1024 + + + + startCpus + + 1 + + + + createDate + + 2010-03-23T17:06:13-05:00 + + + + modifyDate + + 2010-04-22T13:08:43-05:00 + + + + metricPollDate + + 2010-04-22T13:08:00-05:00 + + + + dedicatedAccountHostOnlyFlag + + 0 + + + + powerState + + + + name + + Running + + + + keyName + + RUNNING + + + + + + + softwareComponents + + + + + + + id + + 257314 + + + + hardwareId + + + + + + manufacturerLicenseInstance + + + + + + passwords + + + + + + + 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 + + + + + + + + + + + + + + + + + + primaryIpAddress + + 174.254.254.254 + + + + primaryBackendIpAddress + + 10.254.254.254 + + + + + + + + privateNetworkOnlyFlag + + 0 + + + + id + + 19293 + + + + accountId + + 11111 + + + + statusId + + 1001 + + + + uuid + + 9f99e19b-2c61-9cd5-2081-67b57fd7977b + + + + hostname + + test3 + + + + domain + + libcloud.org + + + + maxCpu + + 2 + + + + maxCpuUnits + + CORE + + + + maxMemory + + 1024 + + + + startCpus + + 2 + + + + createDate + + 2010-04-22T12:38:53-05:00 + + + + modifyDate + + 2010-04-22T13:08:01-05:00 + + + + metricPollDate + + 2010-04-22T13:08:00-05:00 + + + + dedicatedAccountHostOnlyFlag + + 1 + + + + powerState + + + + name + + Running + + + + keyName + + RUNNING + + + + + + + softwareComponents + + + + + + + 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 + + + + + + + + + + + + + + + + + + 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 + + + + dedicatedAccountHostOnlyFlag + + 1 + + + + powerState + + + + name + + Running + + + + keyName + + RUNNING + + + + + + + softwareComponents + + + + + + + id + + 277171 + + + + hardwareId + + + + + + manufacturerLicenseInstance + + + + + + passwords + + + + + + + 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 + + + + + + + + + + + + + + + + + + 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 + + + + powerState + + + + name + + Running + + + + keyName + + RUNNING + + + + + + + softwareComponents + + + + + + + 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 + + + + + + + + + + + + + + + + + + primaryIpAddress + + 174.254.254.254 + + + + primaryBackendIpAddress + + 10.254.254.254 + + + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/v3_SoftLayer_Location_Datacenter_getDatacenters.xml libcloud_vcl/test/compute/fixtures/vcl/v3_SoftLayer_Location_Datacenter_getDatacenters.xml *** ./libcloud/test/compute/fixtures/vcl/v3_SoftLayer_Location_Datacenter_getDatacenters.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/v3_SoftLayer_Location_Datacenter_getDatacenters.xml 2012-04-11 13:23:40.000000000 -0400 *************** *** 0 **** --- 1,99 ---- + + + + + + + + + + id + + 2 + + + + name + + dal00 + + + + longName + + Corporate HQ + + + + + + + + id + + 3 + + + + name + + dal01 + + + + longName + + Dallas + + + + + + + + id + + 18171 + + + + name + + sea01 + + + + longName + + Seattle + + + + + + + + id + + 37473 + + + + name + + wdc01 + + + + longName + + Washington, DC + + + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCaddRequest.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCaddRequest.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCaddRequest.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCaddRequest.xml 2012-04-11 15:39:46.000000000 -0400 *************** *** 0 **** --- 1,23 ---- + + + + + + + + requestid + + 51 + + + + status + + success + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCendRequest.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCendRequest.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCendRequest.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCendRequest.xml 2012-04-11 14:55:37.000000000 -0400 *************** *** 0 **** --- 1,17 ---- + + + + + + + + status + + success + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCextendRequest.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCextendRequest.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCextendRequest.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCextendRequest.xml 2012-04-11 14:53:47.000000000 -0400 *************** *** 0 **** --- 1,17 ---- + + + + + + + + status + + success + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCgetImages.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetImages.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCgetImages.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetImages.xml 2012-04-11 14:49:07.000000000 -0400 *************** *** 0 **** --- 1,61 ---- + + + + + + + + + + + id + + 8 + + + + name + + CentOS 5 (EC2) + + + + + + + + id + + 5 + + + + name + + CentOS 5.4 Base (32 bit VM) + + + + + + + + id + + 6 + + + + name + + WinXP Base (32 bit VM) + + + + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCgetRequestConnectData.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetRequestConnectData.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCgetRequestConnectData.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetRequestConnectData.xml 2012-04-11 15:28:05.000000000 -0400 *************** *** 0 **** --- 1,35 ---- + + + + + + + + status + + ready + + + + serverIP + + 152.46.20.67 + + + + user + + admin + + + + password + + ehkNGW + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCgetRequestIds.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetRequestIds.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCgetRequestIds.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetRequestIds.xml 2012-04-11 15:09:33.000000000 -0400 *************** *** 0 **** --- 1,60 ---- + + + + + + + + status + + success + + + + requests + + + + + + + requestid + + 51 + + + + imageid + + 5 + + + + imagename + + CentOS 5.4 Base (32 bit VM) + + + + start + + 1334150100 + + + + end + + 1334168100 + + + + + + + + + + + + + diff -crBN ./libcloud/test/compute/fixtures/vcl/XMLRPCgetRequestStatus.xml libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetRequestStatus.xml *** ./libcloud/test/compute/fixtures/vcl/XMLRPCgetRequestStatus.xml 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/fixtures/vcl/XMLRPCgetRequestStatus.xml 2012-04-11 15:02:47.000000000 -0400 *************** *** 0 **** --- 1,17 ---- + + + + + + + + status + + ready + + + + + + + Binary files ./libcloud/test/compute/__init__.pyc and libcloud_vcl/test/compute/__init__.pyc differ Binary files ./libcloud/test/compute/test_base.pyc and libcloud_vcl/test/compute/test_base.pyc differ Binary files ./libcloud/test/compute/test_bluebox.pyc and libcloud_vcl/test/compute/test_bluebox.pyc differ Binary files ./libcloud/test/compute/test_brightbox.pyc and libcloud_vcl/test/compute/test_brightbox.pyc differ Binary files ./libcloud/test/compute/test_cloudsigma.pyc and libcloud_vcl/test/compute/test_cloudsigma.pyc differ Binary files ./libcloud/test/compute/test_cloudstack.pyc and libcloud_vcl/test/compute/test_cloudstack.pyc differ Binary files ./libcloud/test/compute/test_deployment.pyc and libcloud_vcl/test/compute/test_deployment.pyc differ Binary files ./libcloud/test/compute/test_dreamhost.pyc and libcloud_vcl/test/compute/test_dreamhost.pyc differ Binary files ./libcloud/test/compute/test_ec2.pyc and libcloud_vcl/test/compute/test_ec2.pyc differ Binary files ./libcloud/test/compute/test_ecp.pyc and libcloud_vcl/test/compute/test_ecp.pyc differ Binary files ./libcloud/test/compute/test_elasticstack.pyc and libcloud_vcl/test/compute/test_elasticstack.pyc differ Binary files ./libcloud/test/compute/test_gandi.pyc and libcloud_vcl/test/compute/test_gandi.pyc differ Binary files ./libcloud/test/compute/test_gogrid.pyc and libcloud_vcl/test/compute/test_gogrid.pyc differ Binary files ./libcloud/test/compute/test_ibm_sbc.pyc and libcloud_vcl/test/compute/test_ibm_sbc.pyc differ Binary files ./libcloud/test/compute/test_joyent.pyc and libcloud_vcl/test/compute/test_joyent.pyc differ Binary files ./libcloud/test/compute/test_linode.pyc and libcloud_vcl/test/compute/test_linode.pyc differ Binary files ./libcloud/test/compute/test_opennebula.pyc and libcloud_vcl/test/compute/test_opennebula.pyc differ Binary files ./libcloud/test/compute/test_openstack.pyc and libcloud_vcl/test/compute/test_openstack.pyc differ Binary files ./libcloud/test/compute/test_opsource.pyc and libcloud_vcl/test/compute/test_opsource.pyc differ Binary files ./libcloud/test/compute/test_rackspacenova.pyc and libcloud_vcl/test/compute/test_rackspacenova.pyc differ Binary files ./libcloud/test/compute/test_rackspace.pyc and libcloud_vcl/test/compute/test_rackspace.pyc differ Binary files ./libcloud/test/compute/test_rimuhosting.pyc and libcloud_vcl/test/compute/test_rimuhosting.pyc differ Binary files ./libcloud/test/compute/test_slicehost.pyc and libcloud_vcl/test/compute/test_slicehost.pyc differ Binary files ./libcloud/test/compute/test_softlayer.pyc and libcloud_vcl/test/compute/test_softlayer.pyc differ Binary files ./libcloud/test/compute/test_ssh_client.pyc and libcloud_vcl/test/compute/test_ssh_client.pyc differ Binary files ./libcloud/test/compute/test_vcloud.pyc and libcloud_vcl/test/compute/test_vcloud.pyc differ diff -crBN ./libcloud/test/compute/test_vcl.py libcloud_vcl/test/compute/test_vcl.py *** ./libcloud/test/compute/test_vcl.py 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/compute/test_vcl.py 2012-04-11 15:51:52.000000000 -0400 *************** *** 0 **** --- 1,149 ---- + # Licensed to the Apache Software Foundation (ASF) under one or more + # contributor license agreements. See the NOTICE file distributed with + # this work for additional information regarding copyright ownership. + # The ASF licenses this file to You under the Apache License, Version 2.0 + # (the "License"); you may not use this file except in compliance with + # the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + import unittest + import sys + + from xml.etree import ElementTree as ET + + from libcloud.utils.py3 import httplib + from libcloud.utils.py3 import xmlrpclib + from libcloud.utils.py3 import next + + from libcloud.compute.drivers.vcl import VCLNodeDriver as VCL + from libcloud.compute.types import NodeState + + from test import MockHttp + from test.file_fixtures import ComputeFileFixtures + from test.secrets import VCL_PARAMS + + class MockVCLTransport(xmlrpclib.Transport): + + def __init__(self, datetime, user, passwd, host): + self._use_datetime = datetime + self._connection = (None, None) + self._extra_headers = [] + + def request(self, host, handler, request_body, verbose=0): + self.verbose = 0 + method = ET.XML(request_body).find('methodName').text + mock = VCLMockHttp(host, 80) + mock.request('POST', method) + resp = mock.getresponse() + + if sys.version[0] == '2' and sys.version[2] == '7': + response = self.parse_response(resp) + else: + response = self.parse_response(resp.body) + return response + + class VCLTests(unittest.TestCase): + + def setUp(self): + VCL.connectionCls.proxyCls.transportCls = MockVCLTransport + self.driver = VCL(*VCL_PARAMS) + + def test_list_nodes(self): + node = self.driver.list_nodes(ipaddr="192.168.1.1")[0] + self.assertEqual(node.name, 'CentOS 5.4 Base (32 bit VM)') + self.assertEqual(node.state, NodeState.RUNNING) + self.assertEqual(node.extra['pass'], 'ehkNGW') + + def test_list_images(self): + images = self.driver.list_images() + image = images[0] + self.assertEqual(image.id, '8') + + def test_list_sizes(self): + sizes = self.driver.list_sizes() + self.assertEqual(len(sizes), 1) + + def test_create_node(self): + image = self.driver.list_images()[0] + node = self.driver.create_node(image=image) + self.assertEqual(node.id, '51') + + def test_destroy_node(self): + node = self.driver.list_nodes(ipaddr="192.168.1.1")[0] + self.assertTrue(self.driver.destroy_node(node)) + + def test_ex_update_node_access(self): + node = self.driver.list_nodes(ipaddr="192.168.1.1")[0] + node = self.driver.ex_update_node_access(node, ipaddr="192.168.1.2") + self.assertEqual(node.name, 'CentOS 5.4 Base (32 bit VM)') + self.assertEqual(node.state, NodeState.RUNNING) + self.assertEqual(node.extra['pass'], 'ehkNGW') + + def test_ex_extend_request_time(self): + node = self.driver.list_nodes(ipaddr="192.168.1.1")[0] + self.assertTrue(self.driver.ex_extend_request_time(node, 60)) + + def test_ex_get_request_end_time(self): + node = self.driver.list_nodes(ipaddr="192.168.1.1")[0] + self.assertEqual( + self.driver.ex_get_request_end_time(node), + 1334168100 + ) + + class VCLMockHttp(MockHttp): + fixtures = ComputeFileFixtures('vcl') + + def XMLRPCgetImages(self, method, url, body, headers): + body = self.fixtures.load('XMLRPCgetImages.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + def XMLRPCextendRequest( + self, method, url, body, headers): + + body = self.fixtures.load('XMLRPCextendRequest.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + def XMLRPCgetRequestIds( + self, method, url, body, headers): + + body = self.fixtures.load( + 'XMLRPCgetRequestIds.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + def XMLRPCgetRequestStatus( + self, method, url, body, headers): + + body = self.fixtures.load( + 'XMLRPCgetRequestStatus.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + def XMLRPCendRequest( + self, method, url, body, headers): + + body = self.fixtures.load( + 'XMLRPCendRequest.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + def XMLRPCaddRequest( + self, method, url, body, headers): + + body = self.fixtures.load( + 'XMLRPCaddRequest.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + def XMLRPCgetRequestConnectData( + self, method, url, body, headers): + + body = self.fixtures.load( + 'XMLRPCgetRequestConnectData.xml') + return (httplib.OK, body, {}, httplib.responses[httplib.OK]) + + if __name__ == '__main__': + sys.exit(unittest.main()) Binary files ./libcloud/test/compute/test_vcl.pyc and libcloud_vcl/test/compute/test_vcl.pyc differ Binary files ./libcloud/test/compute/test_voxel.pyc and libcloud_vcl/test/compute/test_voxel.pyc differ Binary files ./libcloud/test/compute/test_vpsnet.pyc and libcloud_vcl/test/compute/test_vpsnet.pyc differ Binary files ./libcloud/test/dns/__init__.pyc and libcloud_vcl/test/dns/__init__.pyc differ Binary files ./libcloud/test/dns/test_linode.pyc and libcloud_vcl/test/dns/test_linode.pyc differ Binary files ./libcloud/test/dns/test_rackspace.pyc and libcloud_vcl/test/dns/test_rackspace.pyc differ Binary files ./libcloud/test/dns/test_zerigo.pyc and libcloud_vcl/test/dns/test_zerigo.pyc differ Binary files ./libcloud/test/file_fixtures.pyc and libcloud_vcl/test/file_fixtures.pyc differ Binary files ./libcloud/test/__init__.pyc and libcloud_vcl/test/__init__.pyc differ Binary files ./libcloud/test/loadbalancer/__init__.pyc and libcloud_vcl/test/loadbalancer/__init__.pyc differ Binary files ./libcloud/test/loadbalancer/test_brightbox.pyc and libcloud_vcl/test/loadbalancer/test_brightbox.pyc differ Binary files ./libcloud/test/loadbalancer/test_cloudstack.pyc and libcloud_vcl/test/loadbalancer/test_cloudstack.pyc differ Binary files ./libcloud/test/loadbalancer/test_gogrid.pyc and libcloud_vcl/test/loadbalancer/test_gogrid.pyc differ Binary files ./libcloud/test/loadbalancer/test_rackspace.pyc and libcloud_vcl/test/loadbalancer/test_rackspace.pyc differ diff -crBN ./libcloud/test/secrets.py libcloud_vcl/test/secrets.py *** ./libcloud/test/secrets.py 1969-12-31 19:00:00.000000000 -0500 --- libcloud_vcl/test/secrets.py 2012-04-11 13:57:39.000000000 -0400 *************** *** 0 **** --- 1,51 ---- + # Licensed to the Apache Software Foundation (ASF) under one or more + # contributor license agreements. See the NOTICE file distributed with + # this work for additional information regarding copyright ownership. + # The ASF licenses this file to You under the Apache License, Version 2.0 + # (the "License"); you may not use this file except in compliance with + # the License. You may obtain a copy of the License at + # + # http://www.apache.org/licenses/LICENSE-2.0 + # + # Unless required by applicable law or agreed to in writing, software + # distributed under the License is distributed on an "AS IS" BASIS, + # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + # See the License for the specific language governing permissions and + # limitations under the License. + + # Make a copy of this file named 'secrets.py' and add your credentials there. + # Note you can run unit tests without setting your credentials. + + BLUEBOX_PARAMS = ('customer_id', 'api_key') + BRIGHTBOX_PARAMS = ('client_id', 'client_secret') + DREAMHOST_PARAMS = ('key',) + EC2_PARAMS = ('access_id', 'secret') + ECP_PARAMS = ('user_name', 'password') + GANDI_PARAMS = ('user',) + HOSTINGCOM_PARAMS = ('user', 'secret') + IBM_PARAMS = ('user', 'secret') + # OPENSTACK_PARAMS = ('user_name', 'api_key', secure_bool, 'host', port_int) + OPENSTACK_PARAMS = ('user_name', 'api_key', False, 'host', 8774) + OPENNEBULA_PARAMS = ('user', 'key') + OPSOURCE_PARAMS = ('user', 'password') + RACKSPACE_PARAMS = ('user', 'key') + RACKSPACE_NOVA_PARAMS = ('user_name', 'api_key', False, 'host', 8774) + SLICEHOST_PARAMS = ('key',) + SOFTLAYER_PARAMS = ('user', 'api_key') + VCLOUD_PARAMS = ('user', 'secret') + VOXEL_PARAMS = ('key', 'secret') + VPSNET_PARAMS = ('user', 'key') + JOYENT_PARAMS = ('user', 'key') + VCL_PARAMS = ('user', 'pass', True, 'https://host') + + # Storage + STORAGE_S3_PARAMS = ('key', 'secret') + STORAGE_GOOGLE_STORAGE_PARAMS = ('key', 'secret') + + # Loadbalancer + LB_BRIGHTBOX_PARAMS = ('user', 'key') + + # DNS + DNS_PARAMS_LINODE = ('user', 'key') + DNS_PARAMS_ZERIGO = ('email', 'api token') + DNS_PARAMS_RACKSPACE = ('user', 'key') Binary files ./libcloud/test/secrets.pyc and libcloud_vcl/test/secrets.pyc differ diff -crBN ./libcloud/test/secrets.py-dist libcloud_vcl/test/secrets.py-dist *** ./libcloud/test/secrets.py-dist 2012-04-11 15:56:09.000000000 -0400 --- libcloud_vcl/test/secrets.py-dist 2012-04-11 11:33:53.000000000 -0400 *************** *** 36,41 **** --- 36,42 ---- VOXEL_PARAMS = ('key', 'secret') VPSNET_PARAMS = ('user', 'key') JOYENT_PARAMS = ('user', 'key') + VCL_PARAMS = ('user', 'pass', 'host') # Storage STORAGE_S3_PARAMS = ('key', 'secret') Binary files ./libcloud/test/storage/__init__.pyc and libcloud_vcl/test/storage/__init__.pyc differ Binary files ./libcloud/test/storage/test_atmos.pyc and libcloud_vcl/test/storage/test_atmos.pyc differ Binary files ./libcloud/test/storage/test_base.pyc and libcloud_vcl/test/storage/test_base.pyc differ Binary files ./libcloud/test/storage/test_cloudfiles.pyc and libcloud_vcl/test/storage/test_cloudfiles.pyc differ Binary files ./libcloud/test/storage/test_google_storage.pyc and libcloud_vcl/test/storage/test_google_storage.pyc differ Binary files ./libcloud/test/storage/test_s3.pyc and libcloud_vcl/test/storage/test_s3.pyc differ Binary files ./libcloud/test/test_file_fixtures.pyc and libcloud_vcl/test/test_file_fixtures.pyc differ Binary files ./libcloud/test/test_httplib_ssl.pyc and libcloud_vcl/test/test_httplib_ssl.pyc differ Binary files ./libcloud/test/test_pricing.pyc and libcloud_vcl/test/test_pricing.pyc differ Binary files ./libcloud/test/test_response_classes.pyc and libcloud_vcl/test/test_response_classes.pyc differ Binary files ./libcloud/test/test_types.pyc and libcloud_vcl/test/test_types.pyc differ Binary files ./libcloud/test/test_utils.pyc and libcloud_vcl/test/test_utils.pyc differ