Fix bug with regarding to region_name filter

Change-Id: Icbf6418ca0b25ca39e47b572a0793b559d57ea81
Issue-Id: MULTIVIM-62
Signed-off-by: Bin Yang <bin.yang@windriver.com>

diff --git a/kilo/kilo/requests/views/flavor.py b/kilo/kilo/requests/views/flavor.py
index 1e71306..87b851c 100644 (file)
--- a/kilo/kilo/requests/views/flavor.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/hosts.py b/kilo/kilo/requests/views/hosts.py
index 022c59e..2a48ac5 100644 (file)
--- a/kilo/kilo/requests/views/hosts.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/image.py b/kilo/kilo/requests/views/image.py
index a3e7001..a9c532d 100644 (file)
--- a/kilo/kilo/requests/views/image.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/limits.py b/kilo/kilo/requests/views/limits.py
index 3b6f052..9d08472 100644 (file)
--- a/kilo/kilo/requests/views/limits.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/network.py b/kilo/kilo/requests/views/network.py
index 61a409e..4a5667d 100644 (file)
--- a/kilo/kilo/requests/views/network.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/server.py b/kilo/kilo/requests/views/server.py
index 105f73b..0d43ab3 100644 (file)
--- a/kilo/kilo/requests/views/server.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/subnet.py b/kilo/kilo/requests/views/subnet.py
index 8dabafb..3696fa0 100644 (file)
--- a/kilo/kilo/requests/views/subnet.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/tenants.py b/kilo/kilo/requests/views/tenants.py
index 31b17a0..bdf3332 100644 (file)
--- a/kilo/kilo/requests/views/tenants.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/volume.py b/kilo/kilo/requests/views/volume.py
index 41a8f85..6527c07 100644 (file)
--- a/kilo/kilo/requests/views/volume.py
+++ b/kilo/kilo/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/kilo/kilo/requests/views/vport.py b/kilo/kilo/requests/views/vport.py
index 7fd6b90..beb6e80 100644 (file)
--- a/kilo/kilo/requests/views/vport.py
+++ b/kilo/kilo/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"),

diff --git a/newton/newton/requests/views/flavor.py b/newton/newton/requests/views/flavor.py
index 48ccff4..497e105 100644 (file)
--- 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 8f05b7d..86af715 100644 (file)
--- 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 4e929d7..178675a 100644 (file)
--- 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 01bee2b..5df8380 100644 (file)
--- 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 c1eae5e..a68afba 100644 (file)
--- 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 5a9a90c..2b33bcc 100644 (file)
--- 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 6cf6985..af43610 100644 (file)
--- 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 bcc80bd..7bf544e 100644 (file)
--- 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 3f95890..2e693c0 100644 (file)
--- 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 cb80603..021e459 100644 (file)
--- 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"),