commit e8c6f191f2b269f86042b6964a907f56f59ded93
Author: Aldinson Esto <esto.aln@nec.com>
Date:   Mon Aug 17 20:24:39 2020 +0900

    Support of version 2.4.1 on List VNF Request
    
    VNFM returns a "200 OK" response that includes "vnfPkgId"
    in the payload body.
    
    Implements: blueprint support-etsi-nfv-specs
    Spec: https://specs.openstack.org/openstack/tacker-specs/specs/victoria/enhancement_enhance-vnf-lcm-api-support.html
    Change-Id: I3c682802702bffcd7b58ea44a22114c33c8577bf
    (cherry picked from commit 128cd1776619ea2787abdb980a54ec8a9654a44e)

diff --git a/api-ref/source/v1/vnflcm.inc b/api-ref/source/v1/vnflcm.inc
index 5a57b31..67a2096 100644
--- a/api-ref/source/v1/vnflcm.inc
+++ b/api-ref/source/v1/vnflcm.inc
@@ -437,6 +437,7 @@ Response Parameters
   - vnfProductName: vnf_instance_vnf_product_name
   - vnfSoftwareVersion: vnf_instance_vnf_software_version
   - vnfdVersion: vnf_instance_vnfd_version
+  - vnfPkgId: vnf_instance_vnf_pkg_id
   - vimConnectionInfo: vnf_instance_vim_connection_info
   - id: vim_connection_info_id
   - vimId: vim_connection_info_vim_id
diff --git a/tacker/db/db_sqlalchemy/models.py b/tacker/db/db_sqlalchemy/models.py
index e2efb75..24a3637 100644
--- a/tacker/db/db_sqlalchemy/models.py
+++ b/tacker/db/db_sqlalchemy/models.py
@@ -200,9 +200,9 @@ class VnfInstance(model_base.BASE, models.SoftDeleteMixin,
     instantiation_state = sa.Column(sa.String(255), nullable=False)
     task_state = sa.Column(sa.String(255), nullable=True)
     vim_connection_info = sa.Column(sa.JSON(), nullable=True)
-    vnf_pkg_id = sa.Column(types.Uuid, nullable=False)
     tenant_id = sa.Column('tenant_id', sa.String(length=64), nullable=False)
     vnf_metadata = sa.Column(sa.JSON(), nullable=True)
+    vnf_pkg_id = sa.Column(types.Uuid, nullable=False)
 
 
 class VnfInstantiatedInfo(model_base.BASE, models.SoftDeleteMixin,