convert the max and min values to int instead of string

Closes-Bug: #1390317
Change-Id: I6e8517308e51b4a8a03ad4fc27166934a6104841
This commit is contained in:
Craig Vyvial 2014-12-02 15:33:32 -06:00 committed by Nikhil Manchanda
parent 57e2dac929
commit 881fd0ad39
10 changed files with 32 additions and 36 deletions

View File

@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
Content-Length: 149
Content-Length: 147
Date: Mon, 18 Mar 2013 19:09:17 GMT

View File

@ -1,8 +1,7 @@
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"min": "0",
"min": 0,
"name": "collation_server",
"restart_required": false,
"type": "string"
}

View File

@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
Content-Length: 149
Content-Length: 147
Date: Mon, 18 Mar 2013 19:09:17 GMT

View File

@ -1,8 +1,7 @@
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"min": "0",
"min": 0,
"name": "collation_server",
"restart_required": false,
"type": "string"
}

View File

@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
Content-Length: 1030
Content-Length: 1008
Date: Mon, 18 Mar 2013 19:09:17 GMT

View File

@ -2,51 +2,50 @@
"configuration-parameters": [
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"min": "0",
"min": 0,
"name": "collation_server",
"restart_required": false,
"type": "string"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "65535",
"min": "0",
"max": 65535,
"min": 0,
"name": "connect_timeout",
"restart_required": false,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "57671680",
"min": "0",
"max": 57671680,
"min": 0,
"name": "innodb_buffer_pool_size",
"restart_required": true,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "4294967296",
"min": "0",
"max": 4294967296,
"min": 0,
"name": "join_buffer_size",
"restart_required": false,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "4294967296",
"min": "0",
"max": 4294967296,
"min": 0,
"name": "key_buffer_size",
"restart_required": false,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "1",
"min": "0",
"max": 1,
"min": 0,
"name": "local_infile",
"restart_required": false,
"type": "integer"
}
]
}

View File

@ -1,5 +1,5 @@
HTTP/1.1 200 OK
Content-Type: application/json
Content-Length: 1030
Content-Length: 1008
Date: Mon, 18 Mar 2013 19:09:17 GMT

View File

@ -2,51 +2,50 @@
"configuration-parameters": [
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"min": "0",
"min": 0,
"name": "collation_server",
"restart_required": false,
"type": "string"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "65535",
"min": "0",
"max": 65535,
"min": 0,
"name": "connect_timeout",
"restart_required": false,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "57671680",
"min": "0",
"max": 57671680,
"min": 0,
"name": "innodb_buffer_pool_size",
"restart_required": true,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "4294967296",
"min": "0",
"max": 4294967296,
"min": 0,
"name": "join_buffer_size",
"restart_required": false,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "4294967296",
"min": "0",
"max": 4294967296,
"min": 0,
"name": "key_buffer_size",
"restart_required": false,
"type": "integer"
},
{
"datastore_version_id": "b00000b0-00b0-0b00-00b0-000b000000bb",
"max": "1",
"min": "0",
"max": 1,
"min": 0,
"name": "local_infile",
"restart_required": false,
"type": "integer"
}
]
}

View File

@ -127,9 +127,9 @@ class ConfigurationParameterView(object):
"type": self.config.data_type,
}
if self.config.max_size:
ret["max"] = self.config.max_size
ret["max"] = int(self.config.max_size)
if self.config.min_size:
ret["min"] = self.config.min_size
ret["min"] = int(self.config.min_size)
return ret

View File

@ -222,8 +222,8 @@ class CreateConfigurations(ConfigurationsTestBase):
with TypeCheck('ConfigurationParameter', param) as parameter:
parameter.has_field('name', basestring)
parameter.has_field('restart_required', bool)
parameter.has_field('max', basestring)
parameter.has_field('min', basestring)
parameter.has_field('max', int)
parameter.has_field('min', int)
parameter.has_field('type', basestring)
parameter.has_field('datastore_version_id', unicode)