To avoid potential conflicts in the future, prefix all the Aliyun type constant
values with "aliyun".


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/3da15748
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/3da15748
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/3da15748

Branch: refs/heads/trunk
Commit: 3da15748f114cea6b42bc0aa26c034598a8d8948
Parents: 2e5adcc
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Sat Mar 12 13:51:06 2016 -0800
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Sat Mar 12 13:51:06 2016 -0800

----------------------------------------------------------------------
 libcloud/compute/types.py      | 2 +-
 libcloud/loadbalancer/types.py | 2 +-
 libcloud/storage/types.py      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/3da15748/libcloud/compute/types.py
----------------------------------------------------------------------
diff --git a/libcloud/compute/types.py b/libcloud/compute/types.py
index 226966f..eb19bf8 100644
--- a/libcloud/compute/types.py
+++ b/libcloud/compute/types.py
@@ -160,7 +160,7 @@ class Provider(Type):
     NTTA = 'ntta'
     MEDONE = 'medone'
     CISCOCCS = 'ciscoccs'
-    ALIYUN_ECS = 'ecs'
+    ALIYUN_ECS = 'aliyun_ecs'
 
     # OpenStack based providers
     HPCLOUD = 'hpcloud'

http://git-wip-us.apache.org/repos/asf/libcloud/blob/3da15748/libcloud/loadbalancer/types.py
----------------------------------------------------------------------
diff --git a/libcloud/loadbalancer/types.py b/libcloud/loadbalancer/types.py
index 45d6c6a..cfb010b 100644
--- a/libcloud/loadbalancer/types.py
+++ b/libcloud/loadbalancer/types.py
@@ -44,7 +44,7 @@ class Provider(object):
     GCE = 'gce'
     SOFTLAYER = 'softlayer'
     DIMENSIONDATA = 'dimensiondata'
-    ALIYUN_SLB = 'slb'
+    ALIYUN_SLB = 'aliyun_slb'
 
     # Deprecated
     RACKSPACE_US = 'rackspace_us'

http://git-wip-us.apache.org/repos/asf/libcloud/blob/3da15748/libcloud/storage/types.py
----------------------------------------------------------------------
diff --git a/libcloud/storage/types.py b/libcloud/storage/types.py
index 247e59f..2c17ef0 100644
--- a/libcloud/storage/types.py
+++ b/libcloud/storage/types.py
@@ -65,7 +65,7 @@ class Provider(object):
     KTUCLOUD = 'ktucloud'
     AURORAOBJECTS = 'auroraobjects'
     BACKBLAZE_B2 = 'backblaze_b2'
-    ALIYUN_OSS = 'oss'
+    ALIYUN_OSS = 'aliyun_oss'
 
     # Deperecated
     CLOUDFILES_US = 'cloudfiles_us'

Reply via email to