From 2dc39c276d240860fafbdaf53d6a64fedab56bda Mon Sep 17 00:00:00 2001 From: Stavros Sachtouris Date: Tue, 2 Apr 2013 14:23:21 +0300 Subject: [PATCH] Remove invalid header values in image register --- kamaki/cli/commands/image_cli.py | 3 +-- kamaki/clients/image/__init__.py | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kamaki/cli/commands/image_cli.py b/kamaki/cli/commands/image_cli.py index cd3ed1c..69f36c6 100644 --- a/kamaki/cli/commands/image_cli.py +++ b/kamaki/cli/commands/image_cli.py @@ -158,7 +158,7 @@ class image_register(_init_image): 'set container format', '--container-format'), disk_format=ValueArgument('set disk format', '--disk-format'), - id=ValueArgument('set image ID', '--id'), + #id=ValueArgument('set image ID', '--id'), owner=ValueArgument('set image owner (admin only)', '--owner'), properties=KeyValueArgument( 'add property in key=value form (can be repeated)', @@ -191,7 +191,6 @@ class image_register(_init_image): 'checksum', 'container_format', 'disk_format', - 'id', 'owner', 'size', 'is_public']).intersection(self.arguments): diff --git a/kamaki/clients/image/__init__.py b/kamaki/clients/image/__init__.py index b309f30..aba6804 100644 --- a/kamaki/clients/image/__init__.py +++ b/kamaki/clients/image/__init__.py @@ -127,8 +127,8 @@ class ImageClient(Client): async_headers = {} for key, val in params.items(): - if key in ('id', 'store', 'disk_format', 'container_format', - 'size', 'checksum', 'is_public', 'owner'): + if key in ('store', 'disk_format', 'container_format', + 'size', 'checksum', 'is_public', 'owner') and val: key = 'x-image-meta-' + key.replace('_', '-') async_headers[key] = val -- 1.7.10.4