Commit effda5db authored by Nikos Skalkotos's avatar Nikos Skalkotos

Extend the allowed cloud name characters

Allow the characters that kamaki allows
parent f5634b9a
......@@ -180,10 +180,10 @@ def extract_image(session):
def _check_cloud(session, name, description, url, token):
"""Checks if the provided info for a cloud are valid"""
d = session['dialog']
regexp = re.compile('^[a-zA-Z0-9_]+$')
regexp = re.compile('^[~@#$:\-\w]+$')
if not re.match(regexp, name):
d.msgbox("Allowed characters for name: [a-zA-Z0-9_]", width=WIDTH)
d.msgbox("Allowed characters for name: a-zA-Z0-9_~@#$:-", width=WIDTH)
return False
if len(url) == 0:
......
......@@ -38,6 +38,8 @@ The library is used to upload images to and register them with a Synnefo
deployment.
"""
import sys
from os.path import basename
from kamaki.cli.config import Config
......@@ -46,8 +48,11 @@ from kamaki.clients.image import ImageClient
from kamaki.clients.pithos import PithosClient
from kamaki.clients.astakos import AstakosClient
config = Config()
try:
config = Config()
except Exception as e:
sys.stderr.write("Kamaki config error: %s\n" % str(e))
sys.exit(1)
class Kamaki(object):
......
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