(RFC) Fix bugs in VFC-OOF interaction

Here lists all the bugs find and changes.

Change-Id: I36bc3f46e8abaf48d66916b647988be286fbe11e
Issue-ID: VFC-941
Signed-off-by: Ruoyu <ruoyu.ying@intel.com>

diff --git a/lcm/ns_vnfs/biz/grant_vnf.py b/lcm/ns_vnfs/biz/grant_vnf.py
index 6891ee9..4d87c23 100644 (file)
--- a/lcm/ns_vnfs/biz/grant_vnf.py
+++ b/lcm/ns_vnfs/biz/grant_vnf.py
@@ -116,16 +116,19 @@ class GrantVnf(object):
                     logger.debug("Cannot find oof data, retry%s" % (i + 1))
                     time.sleep(5)
                     continue
-                vdu_info = json.loads(offs[0].vdu_info)
-                grant_resp['vimAssets'] = {'computeResourceFlavours': []}
-                for vdu in vdu_info:
-                    grant_resp['vimAssets']['computeResourceFlavours'].append({
-                        'vimConnectionId': offs[0].vim_id,
-                        'resourceProviderId': vdu.get("vduName"),
-                        'vnfdVirtualComputeDescId': None,  # TODO: required
-                        'vimFlavourId': vdu.get("flavorId")
-                    })
-                    # grant_resp['additionalparams'][off.vim_id] = off.directive
+                try:
+                    vdu_info = json.loads(offs[0].vdu_info)
+                    grant_resp['vimAssets'] = {'computeResourceFlavours': []}
+                    for vdu in vdu_info:
+                        grant_resp['vimAssets']['computeResourceFlavours'].append({
+                            'vimConnectionId': offs[0].vim_id,
+                            'resourceProviderId': vdu.get("vduName"),
+                            'vnfdVirtualComputeDescId': None,  # TODO: required
+                            'vimFlavourId': vdu.get("flavorId")
+                        })
+                        # grant_resp['additionalparams'][off.vim_id] = off.directive
+                except Exception:
+                    logger.debug("Load OOF data error")
                 break
 
         logger.debug("grant_resp=%s", grant_resp)

diff --git a/lcm/pub/config/config.py b/lcm/pub/config/config.py
index 3e64583..0d47b96 100644 (file)
--- a/lcm/pub/config/config.py
+++ b/lcm/pub/config/config.py
@@ -70,7 +70,7 @@ DEPLOY_WORKFLOW_WHEN_START = False
 WORKFLOW_OPTION = "buildin"
 
 # [OOF config]
-OOF_BASE_URL = "http://oof-osdf.onap.org:8698"
+OOF_BASE_URL = "http://oof-osdf.onap:8698"
 OOF_USER = "vfc_test"
 OOF_PASSWD = "vfc_testpwd"
 

diff --git a/lcm/pub/database/models.py b/lcm/pub/database/models.py
index 1e70dbc..b45867a 100644 (file)
--- a/lcm/pub/database/models.py
+++ b/lcm/pub/database/models.py
@@ -325,7 +325,7 @@ class OOFDataModel(models.Model):
     transaction_id = models.CharField(db_column='TRANSACTIONID', max_length=255)
     request_status = models.CharField(db_column='REQUESTSTATUS', max_length=50)
     request_module_name = models.CharField(db_column='RESOURCEMODULENAME', max_length=100)
-    service_resource_id = models.CharField(db_column='SERVICERESOURCEID', max_length=255)
+    service_resource_id = models.CharField(db_column='SERVICERESOURCEID', max_length=255, primary_key=True)
     vim_id = models.CharField(db_column='VIMID', max_length=255, null=True, blank=True)
     cloud_owner = models.CharField(db_column='CLOUDOWNER', max_length=100, null=True, blank=True)
     cloud_region_id = models.CharField(db_column='CLOUDREGIONID', max_length=255, null=True, blank=True)