openstack
/
python-manilaclient
Code Issues Proposed changes

fixed service type

This commit is contained in:
Yulia Portnova 2013-09-05 13:12:56 +03:00
parent 5e9ada9fc6
commit a3808636b0
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
.idea

16
cinderclient/shell.py
View File

@ -35,9 +35,9 @@ from cinderclient import utils
from cinderclient.v1 import shell as shell_v1 from cinderclient.v1 import shell as shell_v1
from cinderclient.v2 import shell as shell_v2 from cinderclient.v2 import shell as shell_v2
DEFAULT_OS_VOLUME_API_VERSION = "1" DEFAULT_OS_SHARE_API_VERSION = "1"
DEFAULT_CINDER_ENDPOINT_TYPE = 'publicURL' DEFAULT_MANILA_ENDPOINT_TYPE = 'publicURL'
DEFAULT_CINDER_SERVICE_TYPE = 'compute' DEFAULT_MANILA_SERVICE_TYPE = 'share'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -162,16 +162,16 @@ class OpenStackCinderShell(object):
parser.add_argument('--endpoint-type', parser.add_argument('--endpoint-type',
metavar='<endpoint-type>', metavar='<endpoint-type>',
default=utils.env('CINDER_ENDPOINT_TYPE', default=utils.env('CINDER_ENDPOINT_TYPE',
default=DEFAULT_CINDER_ENDPOINT_TYPE), default=DEFAULT_MANILA_ENDPOINT_TYPE),
help='Defaults to env[CINDER_ENDPOINT_TYPE] or ' help='Defaults to env[CINDER_ENDPOINT_TYPE] or '
+ DEFAULT_CINDER_ENDPOINT_TYPE + '.') + DEFAULT_MANILA_ENDPOINT_TYPE + '.')
parser.add_argument('--endpoint_type', parser.add_argument('--endpoint_type',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
parser.add_argument('--os-volume-api-version', parser.add_argument('--os-volume-api-version',
metavar='<compute-api-ver>', metavar='<compute-api-ver>',
default=utils.env('OS_VOLUME_API_VERSION', default=utils.env('OS_VOLUME_API_VERSION',
default=DEFAULT_OS_VOLUME_API_VERSION), default=DEFAULT_OS_SHARE_API_VERSION),
help='Accepts 1 or 2,defaults ' help='Accepts 1 or 2,defaults '
'to env[OS_VOLUME_API_VERSION].') 'to env[OS_VOLUME_API_VERSION].')
parser.add_argument('--os_volume_api_version', parser.add_argument('--os_volume_api_version',
@ -372,10 +372,10 @@ class OpenStackCinderShell(object):
args.url, args.region_name, args.os_cacert) args.url, args.region_name, args.os_cacert)
if not endpoint_type: if not endpoint_type:
endpoint_type = DEFAULT_CINDER_ENDPOINT_TYPE endpoint_type = DEFAULT_MANILA_ENDPOINT_TYPE
if not service_type: if not service_type:
service_type = DEFAULT_CINDER_SERVICE_TYPE service_type = DEFAULT_MANILA_SERVICE_TYPE
service_type = utils.get_service_type(args.func) or service_type service_type = utils.get_service_type(args.func) or service_type
#FIXME(usrleon): Here should be restrict for project id same as #FIXME(usrleon): Here should be restrict for project id same as