Commit 0b2d7176 authored by Stavros Sachtouris's avatar Stavros Sachtouris
Browse files

Merge branch 'hotfix-0.12.3'

parents 7c5857a6 f2df1530
CHANGELOG for hotfix version 0.12.3
- Import the whole astakosclient package
- Minor typos in help message
CHANGELOG for hotfix version 0.12.2 CHANGELOG for hotfix version 0.12.2
- Always use "details" call in neworks/subnets list - Always use "details" call in neworks/subnets list
......
...@@ -301,7 +301,7 @@ class server_info(_init_cyclades, _optional_json): ...@@ -301,7 +301,7 @@ class server_info(_init_cyclades, _optional_json):
choose_one = ('nics', 'stats', 'diagnostics') choose_one = ('nics', 'stats', 'diagnostics')
count = len([a for a in choose_one if self[a]]) count = len([a for a in choose_one if self[a]])
if count > 1: if count > 1:
raise CLIInvalidArgument('Invalid argument compination', details=[ raise CLIInvalidArgument('Invalid argument combination', details=[
'Arguments %s cannot be used simultaneously' % ', '.join( 'Arguments %s cannot be used simultaneously' % ', '.join(
[self.arguments[a].lvalue for a in choose_one])]) [self.arguments[a].lvalue for a in choose_one])])
self._run(server_id=server_id) self._run(server_id=server_id)
......
...@@ -32,12 +32,13 @@ ...@@ -32,12 +32,13 @@
# or implied, of GRNET S.A. # or implied, of GRNET S.A.
from logging import getLogger from logging import getLogger
from astakosclient import AstakosClient from astakosclient import *
from astakosclient import AstakosClientException # astakosclient contains: AstakosCLient, AstakosClientException
from kamaki.clients import Client, ClientError, RequestManager, recvlog from kamaki.clients import Client, ClientError, RequestManager, recvlog
def _astakos_error(foo): def _astakos_error(foo):
def wrap(self, *args, **kwargs): def wrap(self, *args, **kwargs):
try: try:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment