aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Pauls <michael.pauls@fokus.fraunhofer.de>2017-03-17 18:59:49 +0100
committerMichael Pauls <michael.pauls@fokus.fraunhofer.de>2017-03-17 18:59:49 +0100
commitdce6afeedc21ec9e5b97d630493b9307682ccaa4 (patch)
treeb6a8d944214b0332196c640fc7d12c2e41e8fa92
parent5f82f17a633674c19b69cca877569fd845253343 (diff)
Fix deployment flavor of orchestra machine; Improve bootstrap
Change-Id: I3aa00be7e6e7d3e8de86a8b6a8e9564dc548a3d3 Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de>
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_ims.py2
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_ims.yaml4
2 files changed, 3 insertions, 3 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.py b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index 42b218e6..df57800a 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@ -245,7 +245,7 @@ class ImsVnf(vnf_base.VnfOnBoardingBase):
% (self.imagename, network_id, userdata))
instance = os_utils.create_instance_and_wait_for_active(
- "m1.medium",
+ "orchestra",
os_utils.get_image_id(glance_client, self.imagename),
network_id,
"orchestra-openbaton",
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml b/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml
index 86d6e604..5923a775 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml
+++ b/functest/opnfv_tests/vnf/ims/orchestra_ims.yaml
@@ -2,8 +2,8 @@ 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/bootstrap
- bootstrap_config_link: http://get.openbaton.org/bootstrap-config-file
+ 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
marketplace_link: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
imagename: ubuntu_14.04
vIMS: