summaryrefslogtreecommitdiffstats
path: root/testcases/features/sfc
diff options
context:
space:
mode:
authorManuel Buil <manuel.buil@ericsson.com>2016-08-08 17:11:11 +0200
committerJose Lausuch <jose.lausuch@ericsson.com>2016-08-08 17:49:05 +0000
commit046ed25d21c6941774157001b37f094d797c6011 (patch)
tree25a0afe3ff2f725679e6d4f807682522546d8b42 /testcases/features/sfc
parentdd17bec6a59bb756ce665b678355160c74d013a8 (diff)
Update test with the new SF and new tacker script
- A new SF image was created with a new name. Several files must be updated - There is a new tacker branch for OPNFV Colorado, an update was made Change-Id: Ib5ed364467baca32fa204155655318cb1ec189f5 Signed-off-by: Manuel Buil <manuel.buil@ericsson.com>
Diffstat (limited to 'testcases/features/sfc')
-rwxr-xr-xtestcases/features/sfc/set-up-tacker.sh2
-rwxr-xr-xtestcases/features/sfc/sfc.py6
-rw-r--r--testcases/features/sfc/test-vnfd1.yaml2
-rw-r--r--testcases/features/sfc/test-vnfd2.yaml2
4 files changed, 6 insertions, 6 deletions
diff --git a/testcases/features/sfc/set-up-tacker.sh b/testcases/features/sfc/set-up-tacker.sh
index 3a3656a26..577b7d94e 100755
--- a/testcases/features/sfc/set-up-tacker.sh
+++ b/testcases/features/sfc/set-up-tacker.sh
@@ -1,4 +1,4 @@
-curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=794427a06b46fddecb76b60c8392e37ae504ab60" > poc.tacker-up.sh
+curl "https://gerrit.opnfv.org/gerrit/gitweb?p=fuel.git;a=blob_plain;f=prototypes/sfc_tacker/poc.tacker-up.sh;hb=ddd4e11bb8bc62b7e8b06d4b44a308293c2c3362" > poc.tacker-up.sh
bash poc.tacker-up.sh
touch delete.sh
diff --git a/testcases/features/sfc/sfc.py b/testcases/features/sfc/sfc.py
index c4d7fd785..0073cc92c 100755
--- a/testcases/features/sfc/sfc.py
+++ b/testcases/features/sfc/sfc.py
@@ -26,8 +26,8 @@ HOME = os.environ['HOME'] + "/"
VM_BOOT_TIMEOUT = 180
INSTANCE_NAME = "client"
FLAVOR = "m1.small"
-IMAGE_NAME = "sf_summit2016"
-IMAGE_FILENAME = "sf_summit2016.qcow2"
+IMAGE_NAME = "sf_nsh_colorado"
+IMAGE_FILENAME = "sf_nsh_colorado.qcow2"
IMAGE_FORMAT = "qcow2"
IMAGE_PATH = "/home/opnfv/functest/data" + "/" + IMAGE_FILENAME
@@ -92,7 +92,7 @@ def main():
if not os.path.isfile(IMAGE_PATH):
logger.info("Downloading image")
ft_utils.download_url(
- "http://artifacts.opnfv.org/sfc/demo/sf_summit2016.qcow2",
+ "http://artifacts.opnfv.org/sfc/demo/sf_nsh_colorado.qcow2",
"/home/opnfv/functest/data/")
else:
logger.info("Using old image")
diff --git a/testcases/features/sfc/test-vnfd1.yaml b/testcases/features/sfc/test-vnfd1.yaml
index 310fc5856..5c672e388 100644
--- a/testcases/features/sfc/test-vnfd1.yaml
+++ b/testcases/features/sfc/test-vnfd1.yaml
@@ -10,7 +10,7 @@ service_properties:
vdus:
vdu1:
id: vdu1
- vm_image: sf_summit2016
+ vm_image: sf_nsh_colorado
instance_type: custom
service_type: firewall1
diff --git a/testcases/features/sfc/test-vnfd2.yaml b/testcases/features/sfc/test-vnfd2.yaml
index fd7ba0fce..8a570ab92 100644
--- a/testcases/features/sfc/test-vnfd2.yaml
+++ b/testcases/features/sfc/test-vnfd2.yaml
@@ -10,7 +10,7 @@ service_properties:
vdus:
vdu1:
id: vdu1
- vm_image: sf_summit2016
+ vm_image: sf_nsh_colorado
instance_type: custom
service_type: firewall2