From: maopeng zhang <zhang.maopeng1@zte.com.cn>
Date: Sat, 2 Sep 2017 07:42:22 +0000 (+0000)
Subject: Merge "Add tosca parser"
X-Git-Tag: v1.0.0~74
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3a01f015cfcbb6161c4329444e3999c0c8144b4a;p=vfc%2Fnfvo%2Fcatalog.git

Merge "Add tosca parser"
---

3a01f015cfcbb6161c4329444e3999c0c8144b4a
diff --cc catalog/packages/tests.py
index d3ab8c27,4c23b9d3..d7658081
--- a/catalog/packages/tests.py
+++ b/catalog/packages/tests.py
@@@ -435,16 -446,16 +446,18 @@@ class PackageTest(unittest.TestCase)
      }
  }
      def tearDown(self):
 -        pass
 +        NfPackageModel.objects.all().delete()
 +        NSDModel.objects.all().delete()
 +        JobStatusModel.objects.all().delete()
  
+     @mock.patch.object(NsPackage, 'get_csars')
+     def test_nspackages_get(self,mock_get_csars):
+ 
+         mock_get_csars.return_value = [0,self.csars]
  
-     def test_nspackages_get(self):
          response = self.client.get("/api/catalog/v1/nspackages")
-         print response
          self.assertEqual(status.HTTP_200_OK, response.status_code, response.content)
-         self.assertEquals([],response.data)
+         self.assertEquals(self.csars,response.data)
  
      @mock.patch.object(NsPackage,'get_nsd')
      def test_ns_distribute_2(self, mock_get_nsd):