From: ying.yunlong <ying.yunlong@zte.com.cn>
Date: Mon, 22 Jan 2018 01:55:18 +0000 (+0800)
Subject: Removed vfc-lcm unused code
X-Git-Tag: v1.1.0~238
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=18031aa23a4b785658a59584171fd611bbf04ad3;p=vfc%2Fnfvo%2Flcm.git

Removed vfc-lcm unused code

Change-Id: I40b0bd41be2052dea2fd5466263d01ce320837eb
Issue-ID: VFC-620
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
---

diff --git a/lcm/ns/tests/test_ns_delete.py b/lcm/ns/tests/test_ns_delete.py
index 892528d4..4397ef52 100644
--- a/lcm/ns/tests/test_ns_delete.py
+++ b/lcm/ns/tests/test_ns_delete.py
@@ -11,6 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+
 import json
 import uuid
 
@@ -29,41 +30,11 @@ class TestNsDelelete(TestCase):
         NSInstModel.objects.filter().delete()
         NSInstModel(id=self.ns_inst_id, nspackage_id="7", nsd_id="2").save()
 
-        # self.nsd_id = str(uuid.uuid4())
-        # self.ns_package_id = str(uuid.uuid4())
-        # NSDModel(id=self.ns_package_id, nsd_id=self.nsd_id, name='name').save()
-
     def tearDown(self):
-        # NSDModel.objects.all().delete()
         NSInstModel.objects.all().delete()
 
     @mock.patch.object(restcall, 'call_req')
     def test_delete_ns(self, mock_call_req):
-        # customer_info = {
-        #     "global-customer-id": "global-customer-id-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #     "subscriber-name": "subscriber-name-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #     "subscriber-type": "subscriber-type-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #     "resource-version": "1505350719754",
-        #     "service-subscriptions": {
-        #         "service-subscription": [
-        #             {
-        #                 "service-type": "service-type-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #                 "resource-version": "1505350719887",
-        #                 "service-instances": {
-        #                     "service-instance": [
-        #                         {
-        #                             "service-instance-id": "service-instance-id-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #                             "service-instance-name": "service-instance-name-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #                             "service-type": "service-type-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #                             "service-role": "service-role-9b9348f2-f75d-4559-823d-db7ac138ed34",
-        #                             "resource-version": "1505350720009"
-        #                         }
-        #                     ]
-        #                 }
-        #             }
-        #         ]
-        #     }
-        # }
         ns_info = {
             "service-instance-id": "service-instance-id-9b9348f2-f75d-4559-823d-db7ac138ed34",
             "service-instance-name": "service-instance-name-9b9348f2-f75d-4559-823d-db7ac138ed34",
diff --git a/lcm/ns/vnfs/notify_lcm.py b/lcm/ns/vnfs/notify_lcm.py
index 619c671c..362e347c 100644
--- a/lcm/ns/vnfs/notify_lcm.py
+++ b/lcm/ns/vnfs/notify_lcm.py
@@ -62,6 +62,7 @@ class NotifyLcm(object):
             self.exception('unexpected exception')
 
     def get_vnfinstid(self, mnfinstid, vnfm_inst_id):
+        logger.debug("vnfinstid in vnfm is:%s,vnfmid is:%s", mnfinstid, vnfm_inst_id)
         logger.debug("mnfinstid=%s, vnfm_inst_id=%s", mnfinstid, vnfm_inst_id)
         nfinst = NfInstModel.objects.filter(mnfinstid=mnfinstid, vnfm_inst_id=vnfm_inst_id).first()
         if nfinst: