zun-ui/zun_ui/api/client.py
Shu Muto 051a02a67b Fix image pull action
For now pull image action doesn't work due to server error.
The following patch adds second return value into
_cleanup_params function, but the patch forgot to add the second
return value for _cleanup_params in image_create function.
https://review.openstack.org/#/c/474101/
This patch fixes it.

Change-Id: I5f2dca94821fa8c427e2804626f8b7f4a9fdcbb3
Closes-Bug: #1700479
2017-06-27 11:26:09 +09:00

197 lines
5.8 KiB
Python

# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from horizon import exceptions
from horizon.utils.memoized import memoized
import logging
from openstack_dashboard.api import base
from zunclient.common import utils
from zunclient.v1 import client as zun_client
LOG = logging.getLogger(__name__)
CONTAINER_CREATE_ATTRS = zun_client.containers.CREATION_ATTRIBUTES
IMAGE_PULL_ATTRS = zun_client.images.PULL_ATTRIBUTES
@memoized
def zunclient(request):
zun_url = ""
try:
zun_url = base.url_for(request, 'container')
except exceptions.ServiceCatalogException:
LOG.debug('No Container Management service is configured.')
return None
LOG.debug('zunclient connection created using the token "%s" and url'
'"%s"' % (request.user.token.id, zun_url))
c = zun_client.Client(username=request.user.username,
project_id=request.user.tenant_id,
input_auth_token=request.user.token.id,
zun_url=zun_url)
return c
def _cleanup_params(attrs, check, **params):
args = {}
run = False
for (key, value) in params.items():
if key == "run":
run = value
elif key == "cpu":
args["cpu"] = float(value)
elif key == "memory":
args["memory"] = int(value)
elif key == "interactive":
args["interactive"] = value
elif key == "restart_policy":
args[key] = utils.check_restart_policy(value)
elif key == "environment" or key == "labels":
values = {}
vals = value.split(",")
for v in vals:
kv = v.split("=", 1)
values[kv[0]] = kv[1]
args[str(key)] = values
elif key in attrs:
if value is None:
value = ''
args[str(key)] = str(value)
elif check:
raise exceptions.BadRequest(
"Key must be in %s" % ",".join(attrs))
return args, run
def _delete_attributes_with_same_value(old, new):
'''Delete attributes with same value from new dict
If new dict has same value in old dict, remove the attributes
from new dict.
'''
for k in old.keys():
if k in new:
if old[k] == new[k]:
del new[k]
return new
def container_create(request, **kwargs):
args, run = _cleanup_params(CONTAINER_CREATE_ATTRS, True, **kwargs)
response = None
if run:
response = zunclient(request).containers.run(**args)
else:
response = zunclient(request).containers.create(**args)
return response
def container_update(request, id, **kwargs):
'''Update Container
Get current Container attributes and check updates.
And update with "rename" for "name", then use "update" for
"cpu" and "memory".
'''
# get current data
container = zunclient(request).containers.get(id).to_dict()
if container["memory"] is not None:
container["memory"] = int(container["memory"].replace("M", ""))
args, run = _cleanup_params(CONTAINER_CREATE_ATTRS, True, **kwargs)
# remove same values from new params
_delete_attributes_with_same_value(container, args)
# do rename
name = args.pop("name", None)
if len(args):
zunclient(request).containers.update(id, **args)
# do update
if name:
zunclient(request).containers.rename(id, name)
args["name"] = name
return args
def container_delete(request, id, force=False):
# TODO(shu-mutou): force option should be provided by user.
return zunclient(request).containers.delete(id, force)
def container_list(request, limit=None, marker=None, sort_key=None,
sort_dir=None, detail=True):
# TODO(shu-mutou): detail option should be added, if it is
# implemented in Zun API
return zunclient(request).containers.list(limit, marker, sort_key,
sort_dir)
def container_show(request, id):
return zunclient(request).containers.get(id)
def container_logs(request, id):
args = {}
args["stdout"] = True
args["stderr"] = True
return zunclient(request).containers.logs(id, **args)
def container_start(request, id):
return zunclient(request).containers.start(id)
def container_stop(request, id, timeout):
return zunclient(request).containers.stop(id, timeout)
def container_restart(request, id, timeout):
return zunclient(request).containers.restart(id, timeout)
def container_pause(request, id):
return zunclient(request).containers.pause(id)
def container_unpause(request, id):
return zunclient(request).containers.unpause(id)
def container_execute(request, id, command):
args = {"command": command}
return zunclient(request).containers.execute(id, **args)
def container_kill(request, id, signal=None):
return zunclient(request).containers.kill(id, signal)
def container_attach(request, id):
return zunclient(request).containers.attach(id)
def image_list(request, limit=None, marker=None, sort_key=None,
sort_dir=None, detail=True):
return zunclient(request).images.list(limit, marker, sort_key,
sort_dir, False)
def image_create(request, **kwargs):
args, run = _cleanup_params(IMAGE_PULL_ATTRS, True, **kwargs)
return zunclient(request).images.create(**args)