summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStepan Andrushko <stepanx.andrushko@intel.com>2018-10-29 21:32:44 +0200
committerStepan Andrushko <stepanx.andrushko@intel.com>2018-10-30 21:31:11 +0200
commit012e2db39f103293e140a11fbb6ac417538a3f78 (patch)
tree8858874b91fefa63c5f143d67bb3171483d76484
parentfdd8206d8f3d456fa3e3b56630e7449d55a71258 (diff)
Update: assign static IP to VM for standalone
Updated cloud-init network file to be used on Ubuntu 16.04 and Ubuntu 18.04. Fields 'macaddress' and 'prefix' modified in network-config file. JIRA: YARDSTICK-1402 Change-Id: Ibe7fb9dbf23326a0a6106f98d3b2b9fedf81f79a Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
-rw-r--r--yardstick/benchmark/contexts/standalone/model.py4
-rw-r--r--yardstick/tests/unit/benchmark/contexts/standalone/test_model.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/yardstick/benchmark/contexts/standalone/model.py b/yardstick/benchmark/contexts/standalone/model.py
index 1004c62d1..ab5fec012 100644
--- a/yardstick/benchmark/contexts/standalone/model.py
+++ b/yardstick/benchmark/contexts/standalone/model.py
@@ -107,7 +107,7 @@ version: 2
ethernets:
ens3:
match:
- mac_address: {mac_address}
+ macaddress: {mac_address}
addresses:
- {ip_address}
EOF
@@ -570,6 +570,8 @@ class StandaloneContextHelper(object):
# Update image with public key
key_filename = node.get('key_filename')
ip_netmask = "{0}/{1}".format(node.get('ip'), node.get('netmask'))
+ ip_netmask = "{0}/{1}".format(node.get('ip'),
+ IPNetwork(ip_netmask).prefixlen)
Libvirt.gen_cdrom_image(connection, cdrom_img, vm_name, user_name, key_filename, mac,
ip_netmask)
return node
diff --git a/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py b/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py
index 98d2b1836..10e1e3ba0 100644
--- a/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py
+++ b/yardstick/tests/unit/benchmark/contexts/standalone/test_model.py
@@ -17,6 +17,7 @@ import os
import uuid
import mock
+import netaddr
import unittest
from xml.etree import ElementTree
@@ -292,6 +293,7 @@ class ModelLibvirtTestCase(unittest.TestCase):
hostname = root.find('name').text
mac = "00:11:22:33:44:55"
ip = "{0}/{1}".format(node.get('ip'), node.get('netmask'))
+ ip = "{0}/{1}".format(node.get('ip'), netaddr.IPNetwork(ip).prefixlen)
model.StandaloneContextHelper.check_update_key(self.mock_ssh, node, hostname, id_name,
cdrom_img, mac)
mock_gen_cdrom_image.assert_called_once_with(self.mock_ssh, cdrom_img, hostname,