projects
/
osm
/
LCM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bug 544 Adding license headers
[osm/LCM.git]
/
osm_lcm
/
ROclient.py
diff --git
a/osm_lcm/ROclient.py
b/osm_lcm/ROclient.py
index
b3bc5d5
..
dad89d5
100644
(file)
--- a/
osm_lcm/ROclient.py
+++ b/
osm_lcm/ROclient.py
@@
-3,8
+3,6
@@
##
# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
##
# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U.
-# This file is part of openmano
-# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
@@
-18,8
+16,6
@@
# License for the specific language governing permissions and limitations
# under the License.
#
# License for the specific language governing permissions and limitations
# under the License.
#
-# For those usages not covered by the Apache License, Version 2.0 please
-# contact with: nfvlabs@tid.es
##
"""
##
"""
@@
-103,8
+99,8
@@
class ROClient:
'ns': 'instances'}
mandatory_for_create = {
'tenant': ("name", ),
'ns': 'instances'}
mandatory_for_create = {
'tenant': ("name", ),
- 'vnfd': ("name", "id"
, "connection-point", "vdu"
),
- 'nsd': ("name", "id"
, "constituent-vnfd"
),
+ 'vnfd': ("name", "id"),
+ 'nsd': ("name", "id"),
'ns': ("name", "scenario", "datacenter"),
'vim': ("name", "vim_url"),
'vim_account': (),
'ns': ("name", "scenario", "datacenter"),
'vim': ("name", "vim_url"),
'vim_account': (),
@@
-206,7
+202,7
@@
class ROClient:
try:
UUID(uuid_text)
return True
try:
UUID(uuid_text)
return True
- except
(ValueError, TypeError)
:
+ except
Exception
:
return False
@staticmethod
return False
@staticmethod
@@
-353,7
+349,7
@@
class ROClient:
"""
ns_info = {}
for vnf in ns_descriptor["vnfs"]:
"""
ns_info = {}
for vnf in ns_descriptor["vnfs"]:
- if not vnf.get("ip_address"):
+ if not vnf.get("ip_address")
and vnf.get("vms")
:
raise ROClientException("ns member_vnf_index '{}' has no IP address".format(
vnf["member_vnf_index"]), http_code=409)
vnfr_info = {
raise ROClientException("ns member_vnf_index '{}' has no IP address".format(
vnf["member_vnf_index"]), http_code=409)
vnfr_info = {