diff --git a/LICENSE b/LICENSE index 5948f1ff..1ea0496a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 gvlproject +Copyright (c) 2015 CloudVE Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.rst b/README.rst index e0bbbfe6..6c19820b 100644 --- a/README.rst +++ b/README.rst @@ -2,16 +2,16 @@ CloudBridge aims to provide a simple layer of abstraction over different cloud providers, reducing or eliminating the need to write conditional code for each cloud. -.. image:: https://landscape.io/github/gvlproject/cloudbridge/master/landscape.svg?style=flat - :target: https://landscape.io/github/gvlproject/cloudbridge/master +.. image:: https://landscape.io/github/CloudVE/cloudbridge/master/landscape.svg?style=flat + :target: https://landscape.io/github/CloudVE/cloudbridge/master :alt: Landscape Code Health -.. image:: https://coveralls.io/repos/gvlproject/cloudbridge/badge.svg?branch=master&service=github - :target: https://coveralls.io/github/gvlproject/cloudbridge?branch=master +.. image:: https://coveralls.io/repos/CloudVE/cloudbridge/badge.svg?branch=master&service=github + :target: https://coveralls.io/github/CloudVE/cloudbridge?branch=master :alt: Code Coverage -.. image:: https://codeclimate.com/github/gvlproject/cloudbridge/badges/gpa.svg - :target: https://codeclimate.com/github/gvlproject/cloudbridge +.. image:: https://codeclimate.com/github/CloudVE/cloudbridge/badges/gpa.svg + :target: https://codeclimate.com/github/CloudVE/cloudbridge :alt: Code Climate .. image:: https://img.shields.io/pypi/v/cloudbridge.svg @@ -22,37 +22,37 @@ conditional code for each cloud. :target: http://cloudbridge.readthedocs.org/en/latest/?badge=latest :alt: Documentation Status -.. image:: https://badge.waffle.io/gvlproject/cloudbridge.png?label=in%20progress&title=In%20Progress - :target: https://waffle.io/gvlproject/cloudbridge?utm_source=badge +.. image:: https://badge.waffle.io/CloudVE/cloudbridge.png?label=in%20progress&title=In%20Progress + :target: https://waffle.io/CloudVE/cloudbridge?utm_source=badge :alt: 'Waffle.io - Issues in progress' -.. |aws-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/1 - :target: https://travis-ci.org/gvlproject/cloudbridge -.. |aws-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/4 - :target: https://travis-ci.org/gvlproject/cloudbridge -.. |aws-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/7 - :target: https://travis-ci.org/gvlproject/cloudbridge - -.. |os-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/3 - :target: https://travis-ci.org/gvlproject/cloudbridge -.. |os-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/6 - :target: https://travis-ci.org/gvlproject/cloudbridge -.. |os-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/9 - :target: https://travis-ci.org/gvlproject/cloudbridge - -.. |azure-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/2 - :target: https://travis-ci.org/gvlproject/cloudbridge/branches -.. |azure-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/5 - :target: https://travis-ci.org/gvlproject/cloudbridge/branches -.. |azure-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/master/8 - :target: https://travis-ci.org/gvlproject/cloudbridge/branches - -.. |gce-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/gce/3 - :target: https://travis-ci.org/gvlproject/cloudbridge/branches -.. |gce-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/gce/6 - :target: https://travis-ci.org/gvlproject/cloudbridge/branches -.. |gce-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/gvlproject/cloudbridge/branches/gce/9 - :target: https://travis-ci.org/gvlproject/cloudbridge/branches +.. |aws-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/1 + :target: https://travis-ci.org/CloudVE/cloudbridge +.. |aws-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/4 + :target: https://travis-ci.org/CloudVE/cloudbridge +.. |aws-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/7 + :target: https://travis-ci.org/CloudVE/cloudbridge + +.. |os-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/3 + :target: https://travis-ci.org/CloudVE/cloudbridge +.. |os-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/6 + :target: https://travis-ci.org/CloudVE/cloudbridge +.. |os-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/9 + :target: https://travis-ci.org/CloudVE/cloudbridge + +.. |azure-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/2 + :target: https://travis-ci.org/CloudVE/cloudbridge/branches +.. |azure-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/5 + :target: https://travis-ci.org/CloudVE/cloudbridge/branches +.. |azure-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/master/8 + :target: https://travis-ci.org/CloudVE/cloudbridge/branches + +.. |gce-py27| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/gce/3 + :target: https://travis-ci.org/CloudVE/cloudbridge/branches +.. |gce-py36| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/gce/6 + :target: https://travis-ci.org/CloudVE/cloudbridge/branches +.. |gce-pypy| image:: https://travis-matrix-badges.herokuapp.com/repos/CloudVE/cloudbridge/branches/gce/9 + :target: https://travis-ci.org/CloudVE/cloudbridge/branches Build Status diff --git a/cloudbridge/cloud/base/resources.py b/cloudbridge/cloud/base/resources.py index ab39ff62..8f93a98b 100644 --- a/cloudbridge/cloud/base/resources.py +++ b/cloudbridge/cloud/base/resources.py @@ -62,7 +62,7 @@ class BaseCloudResource(CloudResource): # Regular expression for valid cloudbridge resource names. # They, must match the same criteria as GCE labels. - # as discussed here: https://github.com/gvlproject/cloudbridge/issues/55 + # as discussed here: https://github.com/CloudVE/cloudbridge/issues/55 # # NOTE: The following regex is based on GCEs internal validation logic, # and is significantly complex to allow for international characters. diff --git a/cloudbridge/cloud/providers/azure/services.py b/cloudbridge/cloud/providers/azure/services.py index 0f9f1fc9..6e56008f 100644 --- a/cloudbridge/cloud/providers/azure/services.py +++ b/cloudbridge/cloud/providers/azure/services.py @@ -78,7 +78,7 @@ def create(self, name, description, network_id=None): fw = self.provider.azure_client.create_vm_firewall(name, parameters) # Add default rules to negate azure default rules. - # See: https://github.com/gvlproject/cloudbridge/issues/106 + # See: https://github.com/CloudVE/cloudbridge/issues/106 # pylint:disable=protected-access for rule in fw.default_security_rules: rule_name = "cb-override-" + rule.name diff --git a/cloudbridge/cloud/providers/openstack/resources.py b/cloudbridge/cloud/providers/openstack/resources.py index 009f9907..6c5e3017 100644 --- a/cloudbridge/cloud/providers/openstack/resources.py +++ b/cloudbridge/cloud/providers/openstack/resources.py @@ -1313,7 +1313,7 @@ def upload_from_file(self, path): ``swiftclient.service.get_conn`` factory method to ``self._provider._connect_swift`` - .. seealso:: https://github.com/gvlproject/cloudbridge/issues/35#issuecomment-297629661 # noqa + .. seealso:: https://github.com/CloudVE/cloudbridge/issues/35#issuecomment-297629661 # noqa """ upload_options = {} if 'segment_size' not in upload_options: diff --git a/docs/getting_started.rst b/docs/getting_started.rst index 1edb7592..e5e67e5a 100644 --- a/docs/getting_started.rst +++ b/docs/getting_started.rst @@ -17,12 +17,12 @@ For common issues during setup, check the following section: Create a provider ----------------- -To start, you will need to create a reference to a provider object. The provider -object identifies the cloud you want to work with and supplies your credentials. -The following code snippets show the needed configuration fields to setup a -necessary provider object, for AWS, OpenStack, and Azure. For details on how to -setup providers, take a look at the `Setup page `_. The -remainder of the code is the same for either provider. +To start, you will need to create a reference to a provider object. The +provider object identifies the cloud you want to work with and supplies your +credentials. The following two code snippets setup a necessary provider object, +for AWS and OpenStack. For the details on other providers, take a look at the +`Setup page `_. The remainder of the code is the same for +either provider. AWS: @@ -33,7 +33,7 @@ AWS: config = {'aws_access_key': 'AKIAJW2XCYO4AF55XFEQ', 'aws_secret_key': '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'} provider = CloudProviderFactory().create_provider(ProviderList.AWS, config) - image_id = 'ami-2d39803a' # Ubuntu 14.04 (HVM) + image_id = 'ami-aa2ea6d0' # Ubuntu 16.04 (HVM) OpenStack (with Keystone authentication v2): @@ -64,7 +64,7 @@ OpenStack (with Keystone authentication v3): 'os_user_domain_name': 'domain name'} provider = CloudProviderFactory().create_provider(ProviderList.OPENSTACK, config) - image_id = '97755049-ee4f-4515-b92f-ca00991ee99a' # Ubuntu 14.04 @ Jetstream + image_id = 'acb53109-941f-4593-9bf8-4a53cb9e0739' # Ubuntu 16.04 @ Jetstream Azure: @@ -75,10 +75,9 @@ Azure: config = {'azure_subscription_id': 'REPLACE WITH ACTUAL VALUE', 'azure_client_id': 'REPLACE WITH ACTUAL VALUE', 'azure_secret': 'REPLACE WITH ACTUAL VALUE', - 'azure_tenant': ' REPLACE WITH ACTUAL VALUE', - 'azure_resource_group' : 'REPLACE WITH ACTUAL VALUE'} + 'azure_tenant': ' REPLACE WITH ACTUAL VALUE'} provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config) - image_id = '/subscriptions/{subscription-id}/resourceGroups/{resource-group}/providers/Microsoft.Compute/images/{image-name}' # + image_id = 'Canonical/UbuntuServer/16.04.0-LTS/latest' # Ubuntu 16.04 List some resources diff --git a/docs/topics/design-decisions.rst b/docs/topics/design-decisions.rst index 3b84c87f..fc9d933f 100644 --- a/docs/topics/design-decisions.rst +++ b/docs/topics/design-decisions.rst @@ -17,4 +17,4 @@ It is intended as a reference. lead to a miss match. (Related to 63_.) - .. _63: https://github.com/gvlproject/cloudbridge/issues/63 + .. _63: https://github.com/CloudVE/cloudbridge/issues/63 diff --git a/docs/topics/install.rst b/docs/topics/install.rst index c96b16a9..d866d439 100644 --- a/docs/topics/install.rst +++ b/docs/topics/install.rst @@ -22,9 +22,9 @@ The latest release of cloudbridge can be installed from PyPI:: Latest unreleased dev version ----------------------------- The development version of the library can be installed from the -`Github repo `_:: +`Github repo `_:: - $ git clone https://github.com/gvlproject/cloudbridge.git + $ git clone https://github.com/CloudVE/cloudbridge.git $ cd cloudbridge $ python setup.py install diff --git a/docs/topics/provider_development.rst b/docs/topics/provider_development.rst index ee766a55..8fef80f7 100644 --- a/docs/topics/provider_development.rst +++ b/docs/topics/provider_development.rst @@ -233,8 +233,8 @@ specific manner. -.. _commit 1: https://github.com/gvlproject/cloudbridge/commit/54c67e93a3cd9d51e7d2b1195ebf4e257d165297 -.. _commit 2: https://github.com/gvlproject/cloudbridge/commit/82c0244aa4229ae0aecfe40d769eb93b06470dc7 -.. _commit 3: https://github.com/gvlproject/cloudbridge/commit/e90a7f6885814a3477cd0b38398d62af64f91093 -.. _commit 4: https://github.com/gvlproject/cloudbridge/commit/2d5c14166a538d320e54eed5bc3fa04997828715 -.. _commit 5: https://github.com/gvlproject/cloudbridge/commit/98c9cf578b672867ee503027295f9d901411e496 +.. _commit 1: https://github.com/CloudVE/cloudbridge/commit/54c67e93a3cd9d51e7d2b1195ebf4e257d165297 +.. _commit 2: https://github.com/CloudVE/cloudbridge/commit/82c0244aa4229ae0aecfe40d769eb93b06470dc7 +.. _commit 3: https://github.com/CloudVE/cloudbridge/commit/e90a7f6885814a3477cd0b38398d62af64f91093 +.. _commit 4: https://github.com/CloudVE/cloudbridge/commit/2d5c14166a538d320e54eed5bc3fa04997828715 +.. _commit 5: https://github.com/CloudVE/cloudbridge/commit/98c9cf578b672867ee503027295f9d901411e496 diff --git a/docs/topics/testing.rst b/docs/topics/testing.rst index f06063b5..16877da5 100644 --- a/docs/topics/testing.rst +++ b/docs/topics/testing.rst @@ -74,9 +74,9 @@ You can toggle the use of mock providers by setting an environment variable: ``CB_USE_MOCK_PROVIDERS`` to ``Yes`` or ``No``. -.. _design goals: https://github.com/gvlproject/cloudbridge/ +.. _design goals: https://github.com/CloudVE/cloudbridge/ blob/master/README.rst .. _tox: https://tox.readthedocs.org/en/latest/ -.. _ProviderList: https://github.com/gvlproject/cloudbridge/blob/master/ +.. _ProviderList: https://github.com/CloudVE/cloudbridge/blob/master/ cloudbridge/cloud/factory.py#L15 .. _moto: https://github.com/spulec/moto diff --git a/setup.py b/setup.py index 9390c672..c39d627f 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ REQS_DEV = ([ 'tox>=2.1.1', 'nose', - # 'moto>=1.1.11', # until https://github.com/spulec/moto/issues/1396 + 'moto>=1.1.11', # until https://github.com/spulec/moto/issues/1396 'sphinx>=1.3.1', 'pydevd', 'flake8>=3.3.0',