aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuang Haibin <haibin.huang@intel.com>2018-04-13 15:54:59 +0800
committerHuang Haibin <haibin.huang@intel.com>2018-04-13 15:57:22 +0800
commita499e299107b3776d0e32c88e545940e94cb0a08 (patch)
treeb6a09d7f503614a8a68bb4f7d2baf4d4a7450ac4
parent6591b6a7c1576ecb34e5241e78964b71ebf749cf (diff)
Add vCPE csar test file
Change-Id: I4eb0d19674ae245f51fc88b1031fc684b58800e7 Issue-ID: VFC-875 Signed-off-by: Huang Haibin <haibin.huang@intel.com>
-rw-r--r--catalog/pub/utils/toscaparser/testdata/vcpe/infra.csarbin0 -> 10761 bytes
-rw-r--r--catalog/pub/utils/toscaparser/testdata/vcpe/vbng.csarbin0 -> 10754 bytes
-rw-r--r--catalog/pub/utils/toscaparser/testdata/vcpe/vbrgemu.csarbin0 -> 10460 bytes
-rw-r--r--catalog/pub/utils/toscaparser/testdata/vcpe/vgmux.csarbin0 -> 10723 bytes
-rw-r--r--catalog/pub/utils/toscaparser/testdata/vcpe/vgw.csarbin0 -> 10579 bytes
-rw-r--r--catalog/pub/utils/toscaparser/tests.py16
6 files changed, 16 insertions, 0 deletions
diff --git a/catalog/pub/utils/toscaparser/testdata/vcpe/infra.csar b/catalog/pub/utils/toscaparser/testdata/vcpe/infra.csar
new file mode 100644
index 00000000..78fa2b62
--- /dev/null
+++ b/catalog/pub/utils/toscaparser/testdata/vcpe/infra.csar
Binary files differ
diff --git a/catalog/pub/utils/toscaparser/testdata/vcpe/vbng.csar b/catalog/pub/utils/toscaparser/testdata/vcpe/vbng.csar
new file mode 100644
index 00000000..7180dc19
--- /dev/null
+++ b/catalog/pub/utils/toscaparser/testdata/vcpe/vbng.csar
Binary files differ
diff --git a/catalog/pub/utils/toscaparser/testdata/vcpe/vbrgemu.csar b/catalog/pub/utils/toscaparser/testdata/vcpe/vbrgemu.csar
new file mode 100644
index 00000000..69fdbde6
--- /dev/null
+++ b/catalog/pub/utils/toscaparser/testdata/vcpe/vbrgemu.csar
Binary files differ
diff --git a/catalog/pub/utils/toscaparser/testdata/vcpe/vgmux.csar b/catalog/pub/utils/toscaparser/testdata/vcpe/vgmux.csar
new file mode 100644
index 00000000..4108b696
--- /dev/null
+++ b/catalog/pub/utils/toscaparser/testdata/vcpe/vgmux.csar
Binary files differ
diff --git a/catalog/pub/utils/toscaparser/testdata/vcpe/vgw.csar b/catalog/pub/utils/toscaparser/testdata/vcpe/vgw.csar
new file mode 100644
index 00000000..e23dd27f
--- /dev/null
+++ b/catalog/pub/utils/toscaparser/testdata/vcpe/vgw.csar
Binary files differ
diff --git a/catalog/pub/utils/toscaparser/tests.py b/catalog/pub/utils/toscaparser/tests.py
index bbf7e0da..e7846707 100644
--- a/catalog/pub/utils/toscaparser/tests.py
+++ b/catalog/pub/utils/toscaparser/tests.py
@@ -13,11 +13,14 @@
# limitations under the License.
import json
import os
+import logging
from django.test import TestCase
from catalog.pub.utils.toscaparser import parse_vnfd
+logger = logging.getLogger(__name__)
+
class TestToscaparser(TestCase):
def setUp(self):
@@ -29,6 +32,19 @@ class TestToscaparser(TestCase):
def test_nsd_parse(self):
csar_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/resource-ZteMmeFixVl-csar.csar"
input_parameters = [{"value": "111111", "key": "sdncontroller"}]
+ logger.debug("csar_path:%s", csar_path)
vnfd_json = parse_vnfd(csar_path, input_parameters)
metadata = json.loads(vnfd_json).get("metadata")
self.assertEqual("ZTE-MME-FIX-VL", metadata.get("name", ""))
+
+ def test_vcpe_parse(self):
+ csar_path = os.path.dirname(os.path.abspath(__file__)) + "/testdata/vcpe"
+ input_parameters = [{"value": "222222", "key": "sdncontroller"}]
+ vcpe = ["infra", "vbng", "vbrgemu", "vgmux", "vgw"]
+ for vcpe_part in vcpe:
+ csar_file = ("%s/%s.csar" % (csar_path, vcpe_part))
+ logger.debug("csar_file:%s", csar_file)
+ vnfd_json = parse_vnfd(csar_file, input_parameters)
+ metadata = json.loads(vnfd_json).get("metadata")
+ logger.debug("metadata:%s", metadata)
+ self.assertEqual(("vCPE_%s" % vcpe_part), metadata.get("template_name", ""))