aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-17test_heat: ipaddress expects unicode inputsRoss Brattain1-14/+14
weird error E AddressValueError: '10.20.0.0/15' does not appear to be an IPv4 or IPv6 network. Did you pass in a bytes (str in Python 2) instead of a unicode object? I guess we need to convert the stack.outputs mock to unicode FAILED tests/unit/benchmark/contexts/test_heat.py:137 (HeatContextTestCase.test_add_server_port) self = <tests.unit.benchmark.contexts.test_heat.HeatContextTestCase testMethod=test_add_server_port> def test_add_server_port(self): network1 = mock.MagicMock() network1.vld_id = 'vld111' network2 = mock.MagicMock() network2.vld_id = 'vld777' self.test_context.name = 'foo' self.test_context.stack = mock.MagicMock() self.test_context.networks = { 'a': network1, 'c': network2, } self.test_context.stack.outputs = { 'b': '10.20.30.45', 'b-subnet_id': 1, 'foo-a-subnet-cidr': '10.20.0.0/15', 'foo-a-subnet-gateway_ip': '10.20.30.1', 'b-mac_address': '00:01', 'b-device_id': 'dev21', 'b-network_id': 'net789', 'd': '40.30.20.15', 'd-subnet_id': 2, 'foo-c-subnet-cidr': '40.30.0.0/18', 'foo-c-subnet-gateway_ip': '40.30.20.254', 'd-mac_address': '00:10', 'd-device_id': 'dev43', 'd-network_id': 'net987', } server = mock.MagicMock() server.ports = OrderedDict([ ('a', {'stack_name': 'b'}), ('c', {'stack_name': 'd'}), ]) expected = { "private_ip": '10.20.30.45', "subnet_id": 1, "subnet_cidr": '10.20.0.0/15', "network": '10.20.0.0', "netmask": '255.254.0.0', "gateway_ip": '10.20.30.1', "mac_address": '00:01', "device_id": 'dev21', "network_id": 'net789', "network_name": 'a', "local_mac": '00:01', "local_ip": '10.20.30.45', "vld_id": 'vld111', } > self.test_context.add_server_port(server) tests/unit/benchmark/contexts/test_heat.py:186: _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ yardstick/benchmark/contexts/heat.py:307: in add_server_port network_name, port['stack_name'], self.stack.outputs) yardstick/benchmark/contexts/heat.py:315: in make_interface_dict subnet_ip = ipaddress.ip_network(subnet_cidr) _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ address = '10.20.0.0/15', strict = True def ip_network(address, strict=True): """Take an IP string/int and return an object of the correct type. Args: address: A string or integer, the IP network. Either IPv4 or IPv6 networks may be supplied; integers less than 2**32 will be considered to be IPv4 by default. Returns: An IPv4Network or IPv6Network object. Raises: ValueError: if the string passed isn't either a v4 or a v6 address. Or if the network has host bits set. """ try: return IPv4Network(address, strict) except (AddressValueError, NetmaskValueError): pass try: return IPv6Network(address, strict) except (AddressValueError, NetmaskValueError): pass if isinstance(address, bytes): raise AddressValueError( '%r does not appear to be an IPv4 or IPv6 network. ' 'Did you pass in a bytes (str in Python 2) instead of' > ' a unicode object?' % address) E AddressValueError: '10.20.0.0/15' does not appear to be an IPv4 or IPv6 network. Did you pass in a bytes (str in Python 2) instead of a unicode object? ../../yardstick/yardstick_venv/lib/python2.7/site-packages/ipaddress.py:199: AddressValueError Change-Id: Ie3b087a26a054203573eaa9b13c3e90152bba6a9 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Merge "test_tg_rfc2544_trex: speedup unittest, set time.sleep(0)"Ross Brattain1-4/+5
2017-07-17test_tg_rfc2544_trex: speedup unittest, set time.sleep(0)Ross Brattain1-4/+5
Change-Id: I6fdae629bdbd45cba715a838c41613b914a3abcb Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17test_delete_all_calls_delete: fix delete mockRoss Brattain1-4/+6
we need to mock HeatStack.delete() before we instantiate otherwise we can't reach the instantiated objects delete() method we need to patch the class so we patch all instances Change-Id: I36f9476dcfb83e2d583c5a9f72dc27fce57258eb Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-16test_heat: don't waste 2 seconds in unittestRoss Brattain1-12/+2
remove duration checks and test with sleep 0 Change-Id: I22516cde56ac3a02358ca9c3e652cead10580d76 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Merge "Bugfix: kubernetes context do not implement _get_network"Jing Lu1-0/+3
2017-07-17Bugfix: kubernetes context do not implement _get_networkchenjiankun1-0/+3
Since kubernetes context do not implement _get_network, so when run unit test case, we will get a error: TypeError: Can't instantiate abstract class KubernetesContext with abstract methods _get_network Change-Id: Ib56abe7c580ef8a6fc9f52f3fcd566d0fa70e1cc Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-17Merge "apexlake: speed unittest, mock time.sleep"Ross Brattain3-36/+40
2017-07-17Merge "test_attacker_baremetal: don't run local commands"Ross Brattain2-18/+13
2017-07-17Merge "Kubernetes (k8s) support"Jing Lu10-0/+767
2017-07-17Merge "add network info to topology"Rex Lee15-309/+890
2017-07-17Kubernetes (k8s) supportchenjiankun10-0/+767
JIRA: YARDSTICK-682 We decide to support k8s in E release. We need to discuss with openretriver team and then rewrite the ping test case under k8s as the first step. Change-Id: I3f81ebca8de5c1f3a8b7d42581cd7342dc320239 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14add release dateRoss Brattain1-1/+1
Change-Id: Icf12b7a59144754f65f67ed54a5c455a64c5042f Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-14Danube 3.1 release notesRoss Brattain1-11/+55
Change-Id: I7032dd2348dd7212484a4a3cbd40e1d7698c8668 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-14Merge "Initial all url of api v2"Jing Lu2-7/+32
2017-07-14Merge "test_monitor_command: mock LOG so we don't output error"Ross Brattain2-6/+7
2017-07-14Initial all url of api v2chenjiankun2-7/+32
JIRA: YARDSTICK-648 Change-Id: I915889a974da9c49188c25fe2443ece481987ecb Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14Add API(v2) to get pod infochenjiankun2-0/+20
JIRA: YARDSTICK-724 API: /api/v2/yardstick/pods/<pod_id> METHOD: GET Change-Id: I49608eab1f1625cd4358732da052ce3745e28c24 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-13test_attacker_baremetal: don't run local commandsRoss Brattain2-18/+13
these tests were failing to mock subprocess.check_output and thus were trying to run sudo commands on the local system. This is dangerous. Add the subprocess mock. Also mock the LOG object so we don't print bogus Runtime error tracebacks in the unittest logs when we test assertRaises() Change-Id: I01535f9952fbd95ce2f5972b641c51ff836e7e8c Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-13test_monitor_command: mock LOG so we don't output errorRoss Brattain2-6/+7
Don't print fake tracebacks to the unittest logs Change-Id: I8a468b8c6566f02be88a9dd222567c14c66b0956 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-14Merge "Add API(v2) to delete openrc"Rex Lee1-0/+21
2017-07-14Add API(v2) to upload pod filechenjiankun2-0/+62
JIRA: YARDSTICK-723 API: /api/v2/yardstick/pods/action METHOD: POST PARAMS: { 'action': 'upload_pod_file', 'args': { 'file': file, 'environment_id': environment_id } } Change-Id: I5eb065d8b46080a94c989ec9b8217dc54900bd06 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14Add API(v2) to delete openrcchenjiankun1-0/+21
JIRA: YARDSTICK-722 API: /api/v2/yardstick/environments/openrcs/<openrc_id> METHOD: DELETE Change-Id: Ia0989fe74681654750af80ddb935bb3e63485f43 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14Add API(v2) to get openrc infochenjiankun2-2/+34
JIRA: YARDSTICK-721 API: /api/v2/yardstick/environments/openrcs/<openrc_id> METHOD: GET Change-Id: I57241381cf50fef0dc4eec3281c01ba106262a5a Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14Add API(v2) to update openrcchenjiankun1-0/+41
JIRA: YARDSTICK-720 API: /api/v2/yardstick/environments/openrcs/action METHOD: POST PARAMS: { 'action': 'update_openrc', 'args': { 'openrc': { "EXTERNAL_NETWORK": "ext-net", "OS_AUTH_URL": "http://192.168.23.51:5000/v3", "OS_IDENTITY_API_VERSION": "3", "OS_IMAGE_API_VERSION": "2", "OS_PASSWORD": "console", "OS_PROJECT_DOMAIN_NAME": "default", "OS_PROJECT_NAME": "admin", "OS_TENANT_NAME": "admin", "OS_USERNAME": "admin", "OS_USER_DOMAIN_NAME": "default" }, 'environment_id': environment_id } } Change-Id: Ie9a1614190a01456fd0896f0bdfd05f9d0724fc6 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14Add API(v2) to upload openrcchenjiankun4-0/+123
JIRA: YARDSTICK-719 API: /api/v2/yardstick/environments/openrcs/action METHOD: POST PARAMS: { 'action': 'upload_openrc', 'args': { 'file': file, 'environment_id': environment_id } } Change-Id: If367904a2d0c2d4a192fdc87a8da21ac6549269e Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-14Merge "Add API to delete single environment"Rex Lee1-0/+46
2017-07-14Merge "Add API to get single environment info"Rex Lee2-0/+21
2017-07-14Merge "Add API to get environments"Rex Lee5-0/+45
2017-07-14Merge "test_monitor_multi: speedup unittests, sleep less"Ross Brattain1-1/+1
2017-07-14Merge "test_storperf: speedup unittest, use time.sleep(0)"Ross Brattain1-2/+2
2017-07-14Merge "Add API to create environment"Rex Lee3-1/+37
2017-07-13add network info to topologyRoss Brattain15-309/+890
we need to know which network each port is connected to so we can find VLAN or VXLAN ID. To do this we implement a new method for Contexts, Context.get_network(). This method is similar to Context.get_server(), it searches for a given network name in all the contexts. From this we generate a context_cfg["networks"] dict that stores all the network info for the nodes in the scenario. Then when we generate the topology for VNFD, we can lookup a given network by the vld_id and get the network_type, segmentation_id, etc. Then if we need to for example generated traffic on a given VLAN or VXLAN, we have this info available. Define default nd_route_tbl for ACL VNF we need default empty nd_route_tbl for IPv6 route. Change-Id: I9f9cfbd6acabeb4ae4675ca7354390efa57b29e7 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> Signed-off-by: Edward MacGillivray <edward.s.macgillivray@intel.com>
2017-07-13test_monitor_multi: speedup unittests, sleep lessRoss Brattain1-1/+1
Change-Id: I306e8e5525c3722179a5321988cad76190b93951 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-13test_storperf: speedup unittest, use time.sleep(0)Ross Brattain1-2/+2
Change-Id: I3923d75c1ae7974c7803b0ad6997a5ad0fece11d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-13test_vpe_vnf: speedup unittest, mock timeRoss Brattain1-19/+25
Change-Id: I046fae81c23555573df7d9e2e80995499062cf38 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-13apexlake: speed unittest, mock time.sleepRoss Brattain3-36/+40
Change-Id: I40cbcd1963bbb2481282c34b2360c77a5bef109b Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-13Add API to delete single environmentchenjiankun1-0/+46
JIRA: YARDSTICK-718 API: /api/v2/yardstick/environments/<environment_id> METHOD: DELETE Change-Id: I2e96b0f786440dea46f6b851d3f10f6cc5a0ab40 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-13Add API to get single environment infochenjiankun2-0/+21
JIRA: YARDSTICK-717 API: /api/v2/yardstick/environments/<environment_id> METHOD: GET Change-Id: I9fe42a48520cc17d0f5416080b3595bd6c269761 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-13Add API to get environmentschenjiankun5-0/+45
JIRA: YARDSTICK-716 API: /api/v2/yardstick/environments METHOD: GET Change-Id: I46b7fb2b143fe76b6a0edbf1ecc8281187b85918 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-13update gitignore to exclude *.DS_Store *.logrexlee87761-2/+2
Change-Id: Ibd05768eb08336ecfa3f2454ec5548b48944126f Signed-off-by: rexlee8776 <limingjiang@huawei.com>
2017-07-13Add API to create environmentchenjiankun3-1/+37
JIRA: YARDSTICK-715 API: /api/v2/yardstick/environments/action METHOD: POST PARAM: { 'action': 'create_environment' } Change-Id: I58086be3c70cdc3c4c93516bcfd53ba725486600 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-13Merge "NSBperf: fix bad sigint handler"Ross Brattain2-4/+3
2017-07-13Merge "test_nstat: decrease sleep time for unittest"Ross Brattain1-3/+3
2017-07-12NSBperf: fix bad sigint handlerRoss Brattain2-4/+3
This is why we don't do things at module import time. when we import this module it makes a bad sigint handler. Only load signal handlers at runtime. Also fix handler to take *args, **kwargs. Unittest failures: > time.sleep(0.01) E TypeError: handler() takes 0 positional arguments but 2 were given Change-Id: I4296a4bdef0e5f4d58b0503dcbc834f3bef0feeb Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-12test_nstat: decrease sleep time for unittestRoss Brattain1-3/+3
there is no reason to sleep for a whole minute during unittest Change-Id: I206229bcaa7a50af1859f7b04e521955bb6217d4 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-12Change endpoint to url in APIchenjiankun3-3/+16
There are come conflict with new architecture. Also it is more proper to use url as endpoint. Change-Id: Idce331e36d85d0720bbf3255dca29ba6022e18b2 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-12constants: default SERVER_IP to 127.0.0.1Ross Brattain1-1/+9
When running unittest while connected to P2P VPN, their is no default route, so we get None. Instead of using None, default to 127.0.0.1 Not sure why this was renamed to SERVER_IP either, what do we use this value for? Still getting py.test unittest failures all the time. The problem is we lookup influxdb.ip but SERVER_IP is None, so the lookup fails. INFLUXDB_IP = get_param('influxdb.ip', SERVER_IP) SERVER_IP can't ever be None Change-Id: Iedb09dc541137f7cdc6ef8d26dd312807985bfa8 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-12Merge "Yardstick api database v2 model"Jing Lu3-0/+285
2017-07-12Yardstick api database v2 modelchenjiankun3-0/+285
JIRA: YARDSTICK-713 We have api v2 for gui, and they are all based on the database model. Change-Id: I51b127588b0b84316acff8acf4a7886339646060 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>