diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2018-01-22 09:55:18 +0800 |
|---|---|---|
| committer | ying.yunlong <ying.yunlong@zte.com.cn> | 2018-01-22 09:55:18 +0800 |
| commit | 18031aa23a4b785658a59584171fd611bbf04ad3 (patch) | |
| tree | d8a03927cb415daf4751f048d881403c013c3922 | |
| parent | 64e0b71bb0b7602cb6d6ca546067cfe0714a046a (diff) | |
Removed vfc-lcm unused code
Change-Id: I40b0bd41be2052dea2fd5466263d01ce320837eb
Issue-ID: VFC-620
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
| -rw-r--r-- | lcm/ns/tests/test_ns_delete.py | 31 | ||||
| -rw-r--r-- | lcm/ns/vnfs/notify_lcm.py | 1 |
2 files changed, 2 insertions, 30 deletions
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: |