Code Review
/
vfc
/
gvnfm
/
vnflcm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Align grant request with SOL003.
[vfc/gvnfm/vnflcm.git]
/
lcm
/
lcm
/
pub
/
msapi
/
gvnfmdriver.py
diff --git
a/lcm/lcm/pub/msapi/gvnfmdriver.py
b/lcm/lcm/pub/msapi/gvnfmdriver.py
index
4b2b304
..
763b197
100644
(file)
--- a/
lcm/lcm/pub/msapi/gvnfmdriver.py
+++ b/
lcm/lcm/pub/msapi/gvnfmdriver.py
@@
-60,7
+60,7
@@
def prepare_notification_data(nfinstid, jobid, changetype):
if vm:
vm_resource = {
'vimId': vm[0].vimid,
if vm:
vm_resource = {
'vimId': vm[0].vimid,
- 'resourceId': vm[0].resouceid,
+ 'resourceId': vm[0].resou
r
ceid,
'resourceProviderId': vm[0].vmname, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'vm'
}
'resourceProviderId': vm[0].vmname, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'vm'
}
@@
-75,7
+75,7
@@
def prepare_notification_data(nfinstid, jobid, changetype):
for network in networks:
network_resource = {
'vimConnectionId': network.vimid,
for network in networks:
network_resource = {
'vimConnectionId': network.vimid,
- 'resourceId': network.resouceid,
+ 'resourceId': network.resou
r
ceid,
'resourceProviderId': network.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'network'
}
'resourceProviderId': network.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'network'
}
@@
-92,7
+92,7
@@
def prepare_notification_data(nfinstid, jobid, changetype):
'id': port.portid, # TODO: port.portid or port.nodeid?
'resourceHandle': {
'vimConnectionId': port.vimid,
'id': port.portid, # TODO: port.portid or port.nodeid?
'resourceHandle': {
'vimConnectionId': port.vimid,
- 'resourceId': port.resouceid,
+ 'resourceId': port.resou
r
ceid,
'resourceProviderId': port.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'port'
},
'resourceProviderId': port.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'port'
},
@@
-107,7
+107,7
@@
def prepare_notification_data(nfinstid, jobid, changetype):
'changeType': changetype,
'storageResource': {
'vimConnectionId': vs.vimid,
'changeType': changetype,
'storageResource': {
'vimConnectionId': vs.vimid,
- 'resourceId': vs.resouceid,
+ 'resourceId': vs.resou
r
ceid,
'resourceProviderId': vs.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'volume'
}
'resourceProviderId': vs.name, # TODO: is resourceName mapped to resourceProviderId?
'vimLevelResourceType': 'volume'
}