Merge "Fix incorrect attribute names in v2 API"

tacker/sol_refactored/conductor/vnflcm_driver_v2.py

@@ -379,7 +379,7 @@ class VnfLcmDriverV2(object):
             # As the controller does for req.vimConnectionInfo, if accessInfo
             # or interfaceInfo is not specified, get them from VIM DB.
             # vimId must be in VIM DB.
-            res_vim_infos = grant.vimConnectioninfo
+            res_vim_infos = grant.vimConnectionInfo
             for key, res_vim_info in res_vim_infos.items():
                 if not (res_vim_info.obj_attr_is_set('accessInfo') and
                         res_vim_info.obj_attr_is_set('interfaceInfo')):

tacker/sol_refactored/objects/v1/grant.py

@@ -64,7 +64,7 @@ class GrantV1_VimAssets(base.TackerObject,
 
     fields = {
         'computeResourceFlavours': fields.ListOfObjectsField(
-            'VimComputeResourceFlavour', nullable=True),
+            'VimComputeResourceFlavourV1', nullable=True),
         'softwareImages': fields.ListOfObjectsField(
             'VimSoftwareImageV1', nullable=True),
         'snapshotResources': fields.ListOfObjectsField(

tacker/sol_refactored/objects/v1/resource_definition.py

@@ -42,5 +42,5 @@ class ResourceDefinitionV1(base.TackerObject, base.TackerObjectDictCompat):
         'resource': fields.ObjectField(
             'ResourceHandle', nullable=True),
         'snapshotResDef': fields.ObjectField(
-            'SnapshotResourceDefinition', nullable=True),
+            'SnapshotResourceDefinitionV1', nullable=True),
     }