Merge from OSM SO master

[osm/SO.git] / rwlaunchpad / plugins / rwlaunchpadtasklet / test / utest_uploader_app_dts.py

diff --git a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
index fdc2e22..b9316b5 100755 (executable)
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
@@ -33,25 +33,28 @@ import tornado.ioloop
 import tornado.web
 import tornado.httputil
 
 import tornado.web
 import tornado.httputil
 

-import gi

 import requests
 from tornado.platform.asyncio import AsyncIOMainLoop
 from tornado.ioloop import IOLoop
 from concurrent.futures.thread import ThreadPoolExecutor
 from concurrent.futures.process import ProcessPoolExecutor
 import requests
 from tornado.platform.asyncio import AsyncIOMainLoop
 from tornado.ioloop import IOLoop
 from concurrent.futures.thread import ThreadPoolExecutor
 from concurrent.futures.process import ProcessPoolExecutor

+
+import gi

 gi.require_version('RwDts', '1.0')
 gi.require_version('RwPkgMgmtYang', '1.0')
 gi.require_version('RwDts', '1.0')
 gi.require_version('RwPkgMgmtYang', '1.0')

+gi.require_version('RwProjectVnfdYang', '1.0')

 from gi.repository import (
         RwDts as rwdts,
         RwPkgMgmtYang,
 from gi.repository import (
         RwDts as rwdts,
         RwPkgMgmtYang,

-        RwVnfdYang
-
+        RwProjectVnfdYang as RwVnfdYang,

         )
 
 import rift.tasklets.rwlaunchpad.uploader as uploader
 import rift.tasklets.rwlaunchpad.message as message
 import rift.tasklets.rwlaunchpad.export as export
         )
 
 import rift.tasklets.rwlaunchpad.uploader as uploader
 import rift.tasklets.rwlaunchpad.message as message
 import rift.tasklets.rwlaunchpad.export as export

+from rift.mano.utils.project import DEFAULT_PROJECT

 import rift.test.dts
 import rift.test.dts

+

 import mock
 
 TEST_STRING = "foobar"
 import mock
 
 TEST_STRING = "foobar"


@@ -74,16 +77,23 @@ class TestCase(rift.test.dts.AbstractDTSTest):
         mock_vnfd_catalog = mock.MagicMock()
         self.uid, path = self.create_mock_package()
 
         mock_vnfd_catalog = mock.MagicMock()
         self.uid, path = self.create_mock_package()
 

-        mock_vnfd = RwVnfdYang.YangData_Vnfd_VnfdCatalog_Vnfd.from_dict({
+        mock_vnfd = RwVnfdYang.YangData_RwProject_Project_VnfdCatalog_Vnfd.from_dict({

               "id": self.uid
             })
         mock_vnfd_catalog = {self.uid: mock_vnfd}
 
               "id": self.uid
             })
         mock_vnfd_catalog = {self.uid: mock_vnfd}
 

-        self.app = uploader.UploaderApplication(
-                self.log,
-                self.dts,
-                self.loop,
-                vnfd_catalog=mock_vnfd_catalog)
+        class MockTasklet:
+            def __init__(cls):
+                def get_vnfd_catalog(project=DEFAULT_PROJECT):
+                    return mock_vnfd_catalog
+
+                cls.log = self.log
+                cls.loop = self.loop
+                cls.dts = self.dts
+                cls.get_vnfd_catalog = get_vnfd_catalog
+                cls.get_nsd_catalog = None
+
+        self.app = uploader.UploaderApplication(MockTasklet())

 
         AsyncIOMainLoop().install()
         self.server = tornado.httpserver.HTTPServer(
 
         AsyncIOMainLoop().install()
         self.server = tornado.httpserver.HTTPServer(


@@ -122,7 +132,8 @@ class TestCase(rift.test.dts.AbstractDTSTest):
         yield from self.app.register()
         ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageCreate.from_dict({
                 "package_type": "VNFD",
         yield from self.app.register()
         ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageCreate.from_dict({
                 "package_type": "VNFD",

-                "external_url":  "http://repo.riftio.com/releases/open.riftio.com/4.2.1/VNFS/ping_vnfd.tar.gz"
+                "external_url":  "http://repo.riftio.com/releases/open.riftio.com/4.2.1/VNFS/ping_vnfd.tar.gz",
+                "project_name": DEFAULT_PROJECT

                 })
 
         rpc_out = yield from self.dts.query_rpc(
                 })
 
         rpc_out = yield from self.dts.query_rpc(


@@ -147,7 +158,8 @@ class TestCase(rift.test.dts.AbstractDTSTest):
         # Update
         ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageUpdate.from_dict({
                 "package_type": "VNFD",
         # Update
         ip = RwPkgMgmtYang.YangInput_RwPkgMgmt_PackageUpdate.from_dict({
                 "package_type": "VNFD",

-                "external_url":  "http://repo.riftio.com/releases/open.riftio.com/4.2.1/VNFS/ping_vnfd.tar.gz"
+                "external_url":  "http://repo.riftio.com/releases/open.riftio.com/4.2.1/VNFS/ping_vnfd.tar.gz",
+                "project_name": DEFAULT_PROJECT

                 })
         rpc_out = yield from self.dts.query_rpc(
                     "I,/rw-pkg-mgmt:package-update",
                 })
         rpc_out = yield from self.dts.query_rpc(
                     "I,/rw-pkg-mgmt:package-update",