From: Fu Jinhua <fu.jinhua@zte.com.cn>
Date: Mon, 10 Sep 2018 01:27:26 +0000 (+0000)
Subject: Merge "Align grant request with SOL003."
X-Git-Tag: 1.2.0~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=86af279acebf863b46693e8ba0f2f43013b2b66e;hp=-c;p=vfc%2Fgvnfm%2Fvnflcm.git

Merge "Align grant request with SOL003."
---

86af279acebf863b46693e8ba0f2f43013b2b66e
diff --combined lcm/lcm/nf/const.py
index ff7fb1a6,af0df0d8..15e27155
--- a/lcm/lcm/nf/const.py
+++ b/lcm/lcm/nf/const.py
@@@ -17,7 -17,7 +17,7 @@@ from lcm.pub.utils.jobutil import enu
  
  HEAL_ACTION_TYPE = enum(START="vmCreate", RESTART="vmReset")
  ACTION_TYPE = enum(START=1, STOP=2, REBOOT=3)
- GRANT_TYPE = enum(INSTANTIATE="Instantiate", TERMINATE="Terminate", HEAL_CREATE="Heal Create", HEAL_RESTART="Heal Restart", OPERATE="Operate")
+ GRANT_TYPE = enum(INSTANTIATE="INSTANTIATE", TERMINATE="TERMINATE", HEAL_CREATE="Heal Create", HEAL_RESTART="Heal Restart", OPERATE="OPERATE")
  VNF_STATUS = enum(NULL='null', INSTANTIATING="instantiating", INACTIVE='inactive', ACTIVE="active",
                    FAILED="failed", TERMINATING="terminating", SCALING="scaling", OPERATING="operating",
                    UPDATING="updating", HEALING="healing")
@@@ -715,17 -715,6 +715,17 @@@ vnfdModel = 
                      "vimid": "test",
                      "tenant": "chinamobile",
                      "availability_zone": "test",
 +                    "vnfId": "",
 +                    "vnfName": "",
 +                    "cloudOwner": "",
 +                    "cloudRegionId": "",
 +                    "vduInfo": [
 +                        {
 +                            "vduName": "VDU_vbng_0",
 +                            "flavorName": "flavor_1",
 +                            "directive": ""
 +                        }
 +                    ]
                  },
                  "name": "test",
                  "inject_files": [],