From 9f7f322f30921ecdc4c2f7e4b2e7a147ed9a6712 Mon Sep 17 00:00:00 2001
From: boucherv <valentin.boucher@orange.com>
Date: Wed, 3 Aug 2016 11:17:10 +0200
Subject: functest utils - get_resolvconf_ns() Ensure that dns works with dns
name resolution
JIRA: FUNCTEST-402
Change-Id: I5fa9204aafb13330eb810950aa7bc728f1a69162
Signed-off-by: boucherv <valentin.boucher@orange.com>
---
testcases/vnf/vIMS/orchestrator.py | 2 --
testcases/vnf/vIMS/vIMS.py | 4 ++--
2 files changed, 2 insertions(+), 4 deletions(-)
(limited to 'testcases/vnf/vIMS')
diff --git a/testcases/vnf/vIMS/orchestrator.py b/testcases/vnf/vIMS/orchestrator.py
index d88efe9b3..3da3fb063 100644
--- a/testcases/vnf/vIMS/orchestrator.py
+++ b/testcases/vnf/vIMS/orchestrator.py
@@ -55,8 +55,6 @@ class orchestrator:
def set_nameservers(self, nameservers):
if 0 < len(nameservers):
self.config['dns_subnet_1'] = nameservers[0]
- if 1 < len(nameservers):
- self.config['dns_subnet_2'] = nameservers[1]
def set_logger(self, logger):
self.logger = logger
diff --git a/testcases/vnf/vIMS/vIMS.py b/testcases/vnf/vIMS/vIMS.py
index 790bfa0cc..dfbb6759c 100755
--- a/testcases/vnf/vIMS/vIMS.py
+++ b/testcases/vnf/vIMS/vIMS.py
@@ -441,9 +441,9 @@ def main():
flavor_name = "m1.small"
flavor_id = os_utils.get_flavor_id(nova, flavor_name)
for requirement in CW_REQUIERMENTS:
- if requirement == 'ram_min':
+ if requirement == 'ram_min' and flavor_id == '':
flavor_id = os_utils.get_flavor_id_by_ram_range(
- nova, CW_REQUIERMENTS['ram_min'], 8196)
+ nova, CW_REQUIERMENTS['ram_min'], 4500)
if flavor_id == '':
logger.error(
--
cgit