projects
/
osm
/
NBI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed common files and use osm/common package
[osm/NBI.git]
/
osm_nbi
/
nbi.py
diff --git
a/osm_nbi/nbi.py
b/osm_nbi/nbi.py
index
dda9946
..
ba2e14e
100644
(file)
--- a/
osm_nbi/nbi.py
+++ b/
osm_nbi/nbi.py
@@
-8,9
+8,9
@@
import yaml
import html_out as html
import logging
from engine import Engine, EngineException
import html_out as html
import logging
from engine import Engine, EngineException
-from dbbase import DbException
-from fsbase import FsException
-from msgbase import MsgException
+from
osm_common.
dbbase import DbException
+from
osm_common.
fsbase import FsException
+from
osm_common.
msgbase import MsgException
from base64 import standard_b64decode
#from os import getenv
from http import HTTPStatus
from base64 import standard_b64decode
#from os import getenv
from http import HTTPStatus
@@
-67,6
+67,8
@@
URL: /osm GET POST
/ns_lcm_op_occs 5 5
/<nsLcmOpOccId> 5 5 5
TO BE COMPLETED 5 5
/ns_lcm_op_occs 5 5
/<nsLcmOpOccId> 5 5 5
TO BE COMPLETED 5 5
+ /vnfrs O
+ /<vnfrId> O
/subscriptions 5 5
/<subscriptionId> 5 X
/admin/v1
/subscriptions 5 5
/<subscriptionId> 5 X
/admin/v1
@@
-215,7
+217,10
@@
class Server(object):
},
"ns_lcm_op_occs": {"METHODS": "GET",
"<ID>": {"METHODS": "GET"},
},
"ns_lcm_op_occs": {"METHODS": "GET",
"<ID>": {"METHODS": "GET"},
- }
+ },
+ "vnfrs": {"METHODS": ("GET"),
+ "<ID>": {"METHODS": ("GET")}
+ },
}
},
}
}
},
}
@@
-639,6
+644,8
@@
class Server(object):
engine_item = "nsrs"
if item == "ns_lcm_op_occs":
engine_item = "nslcmops"
engine_item = "nsrs"
if item == "ns_lcm_op_occs":
engine_item = "nslcmops"
+ if item == "vnfrs":
+ engine_item = "vnfrs"
if engine_item == "vims": # TODO this is for backward compatibility, it will remove in the future
engine_item = "vim_accounts"
if engine_item == "vims": # TODO this is for backward compatibility, it will remove in the future
engine_item = "vim_accounts"