Merge "Set default OS_VOLUME_API_VERSION to '2'"

cinderclient/shell.py

@@ -52,7 +52,7 @@ import six.moves.urllib.parse as urlparse
 
 osprofiler_profiler = importutils.try_import("osprofiler.profiler")
 
-DEFAULT_OS_VOLUME_API_VERSION = "1"
+DEFAULT_OS_VOLUME_API_VERSION = "2"
 DEFAULT_CINDER_ENDPOINT_TYPE = 'publicURL'
 DEFAULT_CINDER_SERVICE_TYPE = 'volume'
 

cinderclient/tests/unit/test_auth_plugins.py

@@ -53,6 +53,17 @@ def mock_http_request(resp=None):
                             },
                         ],
                     },
+                    {
+                        "type": "volumev2",
+                        "endpoints": [
+                            {
+                                "region": "RegionOne",
+                                "adminURL": "http://localhost:8774/v2",
+                                "internalURL": "http://localhost:8774/v2",
+                                "publicURL": "http://localhost:8774/v2/",
+                            },
+                        ],
+                    },
                 ],
             },
         }