From aa71f1434b3ac562dca7e19641f2ccbc0f9b7af3 Mon Sep 17 00:00:00 2001
From: Michael Pauls <michael.pauls@fokus.fraunhofer.de>
Date: Fri, 28 Jul 2017 21:00:13 +0200
Subject: update/improve orchestra_ims

-enable orchestra_ims testcase
-update orchestra_ims according to restructed vnf base class
-SNAPS integration
-improve code based on pylint suggestions
-add unit tests (to be completed)

Change-Id: Id12f645c76096376b8a867bf36d7bbb69bac58e7
Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de>
---
 functest/opnfv_tests/vnf/ims/orchestra_ims.yaml | 38 ++++++++++++++++++++-----
 1 file changed, 31 insertions(+), 7 deletions(-)

(limited to 'functest/opnfv_tests/vnf/ims/orchestra_ims.yaml')

diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml b/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml
index 5b25d3c9..9deb11c7 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml
@@ -1,13 +1,37 @@
 tenant_images:
     ubuntu_14.04: http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
     openims: http://marketplace.openbaton.org:8082/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa/img
-openbaton:
-    bootstrap_link: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap
-    bootstrap_config_link: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file
-    userdata:
-        file: https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh
-    marketplace_link: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
-    imagename: ubuntu_14.04
+orchestrator:
+    name: openbaton
+    version: '3.2.0'
+    requirements:
+        flavor:
+          name: orchestra
+          ram_min: 4096
+          disk: 5
+          vcpus: 2
+        os_image: 'ubuntu_14.04'
+    bootstrap:
+        url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap
+        config:
+            url: http://get.openbaton.org/bootstraps/bootstrap_3.2.0_opnfv/bootstrap-config-file
+    gvnfm:
+        userdata:
+            url: https://raw.githubusercontent.com/openbaton/generic-vnfm/3.2.0/src/main/resources/user-data.sh
+    credentials:
+        username: admin
+        password: openbaton
+vnf:
+    name: openims
+    descriptor:
+        url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
+    requirements:
+        flavor:
+          name: m1.small
+          ram_min: 2048
+          disk: 5
+          vcpus: 2
+
 vIMS:
     scscf:
         ports: [3870, 6060]
-- 
cgit 1.2.3-korg