Merge from 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..26d808a 100755 (executable)
--- a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
+++ b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_uploader_app_dts.py
@@ -33,19 +33,20 @@ 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.uploader as uploader


@@ -74,7 +75,7 @@ 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}