projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update from RIFT as of 696b75d2fe9fb046261b08c616f1bcf6c0b54a9b second try
[osm/SO.git]
/
rwlaunchpad
/
plugins
/
rwlaunchpadtasklet
/
test
/
utest_export.py
diff --git
a/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
b/rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
index
7a787c7
..
b3abc37
100755
(executable)
--- a/
rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
+++ b/
rwlaunchpad/plugins/rwlaunchpadtasklet/test/utest_export.py
@@
-29,10
+29,12
@@
import unittest
import uuid
import xmlrunner
import uuid
import xmlrunner
+#Setting RIFT_VAR_ROOT if not already set for unit test execution
+if "RIFT_VAR_ROOT" not in os.environ:
+ os.environ['RIFT_VAR_ROOT'] = os.path.join(os.environ['RIFT_INSTALL'], 'var/rift/unittest')
+
import rift.package.archive
import rift.package.archive
-import rift.package.charm
import rift.package.checksums
import rift.package.checksums
-import rift.package.config
import rift.package.convert
import rift.package.icon
import rift.package.package
import rift.package.convert
import rift.package.icon
import rift.package.package
@@
-42,10
+44,11
@@
import rift.package.store
from rift.tasklets.rwlaunchpad import export
import gi
from rift.tasklets.rwlaunchpad import export
import gi
-gi.require_version('RwVnfdYang', '1.0')
+gi.require_version('ProjectVnfdYang', '1.0')
+gi.require_version('RwProjectVnfdYang', '1.0')
from gi.repository import (
from gi.repository import (
- RwVnfdYang,
- VnfdYang,
+ Rw
ProjectVnfdYang as Rw
VnfdYang,
+
ProjectVnfdYang as
VnfdYang,
)
import utest_package
)
import utest_package
@@
-59,7
+62,7
@@
class TestExport(utest_package.PackageTestCase):
self._vnfd_serializer = rift.package.convert.VnfdSerializer()
def test_create_archive(self):
self._vnfd_serializer = rift.package.convert.VnfdSerializer()
def test_create_archive(self):
- rw_vnfd_msg = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd(
+ rw_vnfd_msg = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd(
id="new_id", name="new_name", description="new_description"
)
json_desc_str = self._rw_vnfd_serializer.to_json_string(rw_vnfd_msg)
id="new_id", name="new_name", description="new_description"
)
json_desc_str = self._rw_vnfd_serializer.to_json_string(rw_vnfd_msg)
@@
-80,11
+83,11
@@
class TestExport(utest_package.PackageTestCase):
self.assertEqual(package.descriptor_msg, rw_vnfd_msg)
def test_export_package(self):
self.assertEqual(package.descriptor_msg, rw_vnfd_msg)
def test_export_package(self):
- rw_vnfd_msg = RwVnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd(
+ rw_vnfd_msg = RwVnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd(
id="new_id", name="new_name", description="new_description",
meta="THIS FIELD IS NOT IN REGULAR VNFD"
)
id="new_id", name="new_name", description="new_description",
meta="THIS FIELD IS NOT IN REGULAR VNFD"
)
- vnfd_msg = VnfdYang.YangData_
Vnfd
_VnfdCatalog_Vnfd()
+ vnfd_msg = VnfdYang.YangData_
RwProject_Project
_VnfdCatalog_Vnfd()
vnfd_msg.from_dict(rw_vnfd_msg.as_dict(), ignore_missing_keys=True)
self.assertNotEqual(rw_vnfd_msg, vnfd_msg)
vnfd_msg.from_dict(rw_vnfd_msg.as_dict(), ignore_missing_keys=True)
self.assertNotEqual(rw_vnfd_msg, vnfd_msg)