diff options
author | Bin Yang <bin.yang@windriver.com> | 2017-04-19 22:39:51 +0800 |
---|---|---|
committer | Bin Yang <bin.yang@windriver.com> | 2017-04-19 22:39:51 +0800 |
commit | f7b8d1840df23c47c3afd0083b27932b70aa8f9f (patch) | |
tree | c454213de444040f00a300724bf8e92b8756ab75 /newton | |
parent | 87df1bff46cbca7402394d9b00cd1703f8f0c84a (diff) |
Fix bug with regarding to region_name filterv2.0.0release/mercury
Change-Id: Icbf6418ca0b25ca39e47b572a0793b559d57ea81
Issue-Id: MULTIVIM-62
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'newton')
-rw-r--r-- | newton/newton/requests/views/flavor.py | 3 | ||||
-rw-r--r-- | newton/newton/requests/views/hosts.py | 3 | ||||
-rw-r--r-- | newton/newton/requests/views/image.py | 6 | ||||
-rw-r--r-- | newton/newton/requests/views/limits.py | 9 | ||||
-rw-r--r-- | newton/newton/requests/views/network.py | 3 | ||||
-rw-r--r-- | newton/newton/requests/views/server.py | 6 | ||||
-rw-r--r-- | newton/newton/requests/views/subnet.py | 3 | ||||
-rw-r--r-- | newton/newton/requests/views/tenants.py | 3 | ||||
-rw-r--r-- | newton/newton/requests/views/volume.py | 3 | ||||
-rw-r--r-- | newton/newton/requests/views/vport.py | 3 |
10 files changed, 14 insertions, 28 deletions
diff --git a/newton/newton/requests/views/flavor.py b/newton/newton/requests/views/flavor.py index 48ccff46..497e105f 100644 --- a/newton/newton/requests/views/flavor.py +++ b/newton/newton/requests/views/flavor.py @@ -28,8 +28,7 @@ logger = logging.getLogger(__name__) class Flavors(APIView): service = {'service_type': 'compute', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("project_id", "tenantId"), ("ram", "memory"), diff --git a/newton/newton/requests/views/hosts.py b/newton/newton/requests/views/hosts.py index 8f05b7d5..86af7152 100644 --- a/newton/newton/requests/views/hosts.py +++ b/newton/newton/requests/views/hosts.py @@ -28,8 +28,7 @@ logger = logging.getLogger(__name__) class Hosts(APIView): service = {'service_type': 'compute', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} hosts_keys_mapping = [ ("host_name", "name"), diff --git a/newton/newton/requests/views/image.py b/newton/newton/requests/views/image.py index 4e929d70..178675ae 100644 --- a/newton/newton/requests/views/image.py +++ b/newton/newton/requests/views/image.py @@ -32,8 +32,7 @@ running_thread_lock = threading.Lock() class imageThread (threading.Thread): service = {'service_type': 'image', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} def __init__(self, vimid, tenantid, imageid, imagefd): threading.Thread.__init__(self) self.vimid = vimid @@ -76,8 +75,7 @@ class imageThread (threading.Thread): class Images(APIView): service = {'service_type': 'image', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("project_id", "tenantId"), ("disk_format", "imageType"), diff --git a/newton/newton/requests/views/limits.py b/newton/newton/requests/views/limits.py index 01bee2ba..5df83808 100644 --- a/newton/newton/requests/views/limits.py +++ b/newton/newton/requests/views/limits.py @@ -28,16 +28,13 @@ logger = logging.getLogger(__name__) class Limits(APIView): service = {'service_type': 'compute', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} service_network = {'service_type': 'network', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} service_volume = {'service_type': 'volumev2', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} def get(self, request, vimid="", tenantid=""): logger.debug("Limits--get::> %s" % request.data) diff --git a/newton/newton/requests/views/network.py b/newton/newton/requests/views/network.py index c1eae5ed..a68afba3 100644 --- a/newton/newton/requests/views/network.py +++ b/newton/newton/requests/views/network.py @@ -28,8 +28,7 @@ logger = logging.getLogger(__name__) class Networks(APIView): service = {'service_type': 'network', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("provider:segmentation_id", "segmentationId"), ("provider:physical_network", "physicalNetwork"), diff --git a/newton/newton/requests/views/server.py b/newton/newton/requests/views/server.py index 5a9a90c3..2b33bccf 100644 --- a/newton/newton/requests/views/server.py +++ b/newton/newton/requests/views/server.py @@ -34,8 +34,7 @@ running_thread_lock = threading.Lock() #assume volume is attached on server creation class serverThread (threading.Thread): service = {'service_type': 'compute', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} def __init__(self, vimid, tenantid, serverid, is_attach, *volumeids): threading.Thread.__init__(self) self.vimid = vimid @@ -128,8 +127,7 @@ class serverThread (threading.Thread): class Servers(APIView): service = {'service_type': 'compute', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("tenant_id", "tenantId"), ("flavorRef", "flavorId"), diff --git a/newton/newton/requests/views/subnet.py b/newton/newton/requests/views/subnet.py index 6cf69858..af436107 100644 --- a/newton/newton/requests/views/subnet.py +++ b/newton/newton/requests/views/subnet.py @@ -28,8 +28,7 @@ logger = logging.getLogger(__name__) class Subnets(APIView): service = {'service_type': 'network', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("project_id", "tenantId"), ("network_id", "networkId"), diff --git a/newton/newton/requests/views/tenants.py b/newton/newton/requests/views/tenants.py index bcc80bd9..7bf544e0 100644 --- a/newton/newton/requests/views/tenants.py +++ b/newton/newton/requests/views/tenants.py @@ -29,8 +29,7 @@ DEBUG=True class Tenants(APIView): service = {'service_type': 'identity', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("projects", "tenants"), ] diff --git a/newton/newton/requests/views/volume.py b/newton/newton/requests/views/volume.py index 3f958907..2e693c07 100644 --- a/newton/newton/requests/views/volume.py +++ b/newton/newton/requests/views/volume.py @@ -28,8 +28,7 @@ logger = logging.getLogger(__name__) class Volumes(APIView): service = {'service_type': 'volumev2', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("project_id", "tenantId"), ("created_at", "createTime"), diff --git a/newton/newton/requests/views/vport.py b/newton/newton/requests/views/vport.py index cb806038..021e459c 100644 --- a/newton/newton/requests/views/vport.py +++ b/newton/newton/requests/views/vport.py @@ -28,8 +28,7 @@ logger = logging.getLogger(__name__) class Vports(APIView): service = {'service_type': 'network', - 'interface': 'public', - 'region_name': 'RegionOne'} + 'interface': 'public'} keys_mapping = [ ("project_id", "tenantId"), ("network_id", "networkId"), |