providers/ec2: support VPC

juju/charm/repository.py

 import json
 import logging
 import os
 import tempfile
 import urllib
 import urlparse
 import yaml
 
 from twisted.internet.defer import fail, inlineCallbacks, returnValue, succeed
-from twisted.web.client import downloadPage, getPage
 from twisted.web.error import Error
 from txaws.client.ssl import VerifyingContextFactory
 
 from juju.charm.provider import get_charm_from_path
 from juju.charm.url import CharmURL
 from juju.errors import FileNotFound
 from juju.lib import under
+from juju.lib.http_client import download_page, get_page
 
 from .errors import (
     CharmNotFound, CharmError, RepositoryNotFound, ServiceConfigValueError)
 
 log = logging.getLogger("juju.charm")
 
 CS_STORE_URL = "https://store.juju.ubuntu.com"
 
 
 def _makedirs(path):
@@ skipping 94 matching lines @@
     def __str__(self):
         return "charm store"
 
     @inlineCallbacks
     def _get_info(self, charm_url):
         charm_id = str(charm_url)
         url = "%s/charm-info?charms=%s" % (
             self.url_base, urllib.quote(charm_id))
         try:
             host = urlparse.urlparse(url).hostname
-            all_info = json.loads((yield getPage(url, contextFactory=VerifyingContextFactory(host))))
+            all_info = json.loads((yield get_page(url, contextFactory=VerifyingContextFactory(host))))
             charm_info = all_info[charm_id]
             for warning in charm_info.get("warnings", []):
                 log.warning("%s: %s", charm_id, warning)
             errors = charm_info.get("errors", [])
             if errors:
                 raise CharmError(charm_id, "; ".join(errors))
             returnValue(charm_info)
         except Error:
             raise CharmNotFound(self.url_base, charm_url)
 
     @inlineCallbacks
     def _download(self, charm_url, cache_path):
         url = "%s/charm/%s" % (self.url_base, urllib.quote(charm_url.path))
         downloads = os.path.join(self.cache_path, "downloads")
         _makedirs(downloads)
         f = tempfile.NamedTemporaryFile(
             prefix=_cache_key(charm_url), suffix=".part", dir=downloads,
             delete=False)
         f.close()
         downloading_path = f.name
         host = urlparse.urlparse(url).hostname
         try:
-            yield downloadPage(url, downloading_path, contextFactory=VerifyingContextFactory(host))
+            yield download_page(url, downloading_path, contextFactory=VerifyingContextFactory(host))
         except Error:
             raise CharmNotFound(self.url_base, charm_url)
         os.rename(downloading_path, cache_path)
 
     @inlineCallbacks
     def find(self, charm_url):
         info = yield self._get_info(charm_url)
         revision = info["revision"]
         if charm_url.revision is None:
             charm_url = charm_url.with_revision(revision)
@@ skipping 39 matching lines @@
         both the charm's data and all information necessary to specify its
         source.
     """
     url = CharmURL.infer(vague_name, default_series)
     if url.collection.schema == "local":
         repo = LocalCharmRepository(repository_path)
     elif url.collection.schema == "cs":
         # The eventual charm store url, point to elastic ip for now b2
         repo = RemoteCharmRepository(CS_STORE_URL)
     return repo, url