git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'nocomponent' into geni-v3
[sfa.git]
/
sfa
/
server
/
api_versions.py
diff --git
a/sfa/server/api_versions.py
b/sfa/server/api_versions.py
index
9b05dbe
..
6e58492
100644
(file)
--- a/
sfa/server/api_versions.py
+++ b/
sfa/server/api_versions.py
@@
-2,13
+2,14
@@
import os
from sfa.util.xml import XML
from sfa.util.config import Config
from sfa.util.xml import XML
from sfa.util.config import Config
+
class ApiVersions:
required_fields = ['version', 'url']
class ApiVersions:
required_fields = ['version', 'url']
-
+
template = """<api_versions>
<api_version name="" version="" url="" />
template = """<api_versions>
<api_version name="" version="" url="" />
-</api_versions>"""
+</api_versions>"""
def __init__(self, string=None, filename=None, create=False):
self.xml = None
def __init__(self, string=None, filename=None, create=False):
self.xml = None
@@
-22,9
+23,10
@@
class ApiVersions:
else:
# load the default file
c = Config()
else:
# load the default file
c = Config()
- api_versions_file = os.path.sep.join([c.config_path, 'api_versions.xml'])
+ api_versions_file = os.path.sep.join(
+ [c.config_path, 'api_versions.xml'])
self.load(api_versions_file)
self.load(api_versions_file)
-
+
def create(self):
self.xml = XML(string=ApiVersions.template)
def create(self):
self.xml = XML(string=ApiVersions.template)
@@
-39,8
+41,7
@@
class ApiVersions:
if isinstance(value, list):
for item in value:
if isinstance(item, dict) and \
if isinstance(value, list):
for item in value:
if isinstance(item, dict) and \
- set(ApiVersions.required_fields).issubset(item.keys()):
+ set(ApiVersions.required_fields).issubset(item.keys()) and \
+ item['version'] != '' and item['url'] != '':
versions[str(item['version'])] = item['url']
versions[str(item['version'])] = item['url']
- return versions
-
-
+ return versions