Revision effda5db
b/image_creator/dialog_util.py | ||
---|---|---|
180 | 180 |
def _check_cloud(session, name, description, url, token): |
181 | 181 |
"""Checks if the provided info for a cloud are valid""" |
182 | 182 |
d = session['dialog'] |
183 |
regexp = re.compile('^[a-zA-Z0-9_]+$')
|
|
183 |
regexp = re.compile('^[~@#$:\-\w]+$')
|
|
184 | 184 |
|
185 | 185 |
if not re.match(regexp, name): |
186 |
d.msgbox("Allowed characters for name: [a-zA-Z0-9_]", width=WIDTH)
|
|
186 |
d.msgbox("Allowed characters for name: a-zA-Z0-9_~@#$:-", width=WIDTH)
|
|
187 | 187 |
return False |
188 | 188 |
|
189 | 189 |
if len(url) == 0: |
b/image_creator/kamaki_wrapper.py | ||
---|---|---|
38 | 38 |
deployment. |
39 | 39 |
""" |
40 | 40 |
|
41 |
import sys |
|
42 |
|
|
41 | 43 |
from os.path import basename |
42 | 44 |
|
43 | 45 |
from kamaki.cli.config import Config |
... | ... | |
46 | 48 |
from kamaki.clients.pithos import PithosClient |
47 | 49 |
from kamaki.clients.astakos import AstakosClient |
48 | 50 |
|
49 |
|
|
50 |
config = Config() |
|
51 |
try: |
|
52 |
config = Config() |
|
53 |
except Exception as e: |
|
54 |
sys.stderr.write("Kamaki config error: %s\n" % str(e)) |
|
55 |
sys.exit(1) |
|
51 | 56 |
|
52 | 57 |
|
53 | 58 |
class Kamaki(object): |
Also available in: Unified diff