summaryrefslogtreecommitdiffstats
path: root/docs/submodules
AgeCommit message (Collapse)AuthorFilesLines
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to create influxdb" - Add API(v2) to create influxdb JIRA: YARDSTICK-726 API: /api/v2/yardstick/containers/action METHOD: POST PARAMS: { 'action': 'create_influxdb', 'args': { 'environment_id': environment_id } } Change-Id: I20961fc6ae9918c894de7fabd3f81ca966bd24cd Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "Add API(v2) to delete pod" - Add API(v2) to delete pod JIRA: YARDSTICK-725 API: /api/v2/yardstick/pods/<pod_id> METHOD: DELETE Change-Id: Ib9e9f9ced455c4ee3b6e1f63d773ea2e3ee906a6 Signed-off-by: chenjiankun <chenjiankun1@huawei.com>
2017-07-19Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "doctor: workaround for bug of set-functest-env.sh" - doctor: workaround for bug of set-functest-env.sh `set-functest-env.sh' is expected to run with functest jobs, so it need one of the files in functest repo placed under WORKSPACE. This patch avoiding this bug by getting functest repo in pre section of functest trigger. Change-Id: Ib266781005bab18f34fa0cdfe50e0facb95d27ef Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
2017-07-19Update git submodulesSerena Feng1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "Add support for review jupyter notebook from nbviewer" - Add support for review jupyter notebook from nbviewer It is done by uploading the notebook under reviewer to artifacts and add the nbviewer link in gerrit comments It is needed because reviewing jupyter notebook[1] directly in gerrit is very difficult. See example in [2]. It will be much easier if we can preview the result in nbviewer. See example in [3] [1]: http://jupyter.org/ [2]: https://gerrit.opnfv.org/gerrit/#/c/37227/ [3]: https://nbviewer.jupyter.org/urls/git.opnfv.org/qtip/plain/examples/storage-qpi-report/storage-qpi.ipynb Change-Id: I3e4c301f362ff6ac97aebc9d09c7103278efb136 Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
2017-07-19Update git submodulesxiaodong shang1-0/+0
* Update docs/submodules/parser from branch 'master' - Merge "Update cirros image to 0.3.5" - Update cirros image to 0.3.5 The image that is offered by Functest in the container is 0.3.5 This changes avoids downloading 0.3.2 in Functest. See [1] [1] https://gerrit.opnfv.org/gerrit/#/c/37393/6/functest/ci/download_images.sh Change-Id: I04ecc9bbed77fb39774460dfb466c32db49b8d98 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-07-19Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - Revert "p/fuel: network: public: Use arm-virtual2 POD cfg" This reverts commit 779c0cc56646da234019577e17f4af378a205e08. Change-Id: Ia5261da363579e7bec442ada58ca16635025f872
2017-07-18Update git submodulesMark Beierl1-0/+0
* Update docs/submodules/storperf from branch 'master' - Merge "Tool to create docker-compose.yml" - Tool to create docker-compose.yml Tool to create docker-compose.yml file by setting the environment variables according to the input given by user. Change-Id: I25d7f4d1ec48221a8482986437db747bb05c5004 JIRA: STORPERF-129 Signed-off-by: Shrenik <shrenik.jain@research.iiit.ac.in>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: network: public: Use arm-virtual2 POD cfg FIXME: This should be converted into a dynamic configuration read from the universal POD descriptor in securedlab, once that is ready. Until then, just align the public network configuration used by the virtual POD with the Enea lab configuration specific to arm-virtual2 (i.e. public network on 10.0.9.0/24). NOTE: Instead of replacing the gateway 10.16.0.1 (now 10.0.9.1) with our lab's gateway (10.0.9.254), keep it as an extra hop, in order not to break deploys in different enviroments. Also, since our gateway resides at 10.0.9.254, trim the DHCP pool range for the public network to not include that address. Change-Id: If45ca3140f770f758f0d02c1049084f67f83264e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: Rebase after --noautoconsole got upstream Change-Id: I99b6052a26169888c137f874889872107c7df931 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - Merge "mcp: openstack: Install & configure horizon" - mcp: openstack: Install & configure horizon Change-Id: I2f6b136efebfee95a9a192c40afb88d20bbacef0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'master' - mcp: lib.sh: virt-install --noautoconsole When X server is available, virt-install tries opening virt-viewer automatically (for each newly created VM), which blocks the deployment until the user closes the virt-viewer window. Without X, virt-install just throws a warning and moves on. Fix both of the above by passing the "--noautoconsole" argument to virt-install. Change-Id: I7df839aa902f7629dec11d24905fc05d1070f9db Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Added proper assertion config NIC test." - Added proper assertion config NIC test. The test that exercises the OpenStackVmInstance class config_nic() now checks the Ansible return code. JIRA: SNAPS-124 Change-Id: I7840cd53eea2eacf7952d14be30870c8fa3aeab8 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-18Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new class AnsibleException." - Created new class AnsibleException. Raising AnsibleException in ansible_utils.py instead of Exception. JIRA: SNAPS-130 Change-Id: I72d7ea3779c9644559ae7dc4dbb26edc4da20594 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-18Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new class NovaException." - Created new class NovaException. Raising NovaException in nova_utils.py instead of Exception. Change-Id: I9564e43352114df18bccc794a5cd57e20880085f Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-18Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new class NeutronException." - Created new class NeutronException. Raising NeutronException in neutron_utils.py instead of Exception. JIRA: SNAPS-128 Change-Id: I567db38a5dfcaae9bbfc6c74558521b0e28d9d46 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-18Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Last task necessary to stop users from easily obtaining OS objects. Changed external interfaces still exposing OpenStack created APIs to either return SNAPS-OO domain objects or objects contained on the OpenStack generated objects as to not leak implementation details that would eventually break the library when new API versions are released. JIRA: SNAPS-125 Change-Id: Iab6d6d298c4c5da68daed4b1b252313a1595a295 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-18Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Change calls to SNAPS library exposing OpenStack instance objects." - Change calls to SNAPS library exposing OpenStack instance objects. Openstack object structures can change when new API versions are released and SNAPS no longer is exposing OpenStack object implementations as this makes the library brittle. The only two SNAPS method calls affected are when functest needs to query for external networks and when vPing Userdata needs to obtain the console logs. JIRA: SNAPS-125 Change-Id: If6000e50eaa274713d9a6c964eabd1f73ded684e Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-18Update git submodulesEmma Foley1-0/+0
* Update docs/submodules/barometer from branch 'master' - Updates OpenStack plugins information * Adds Aodh plugin description * Adds Gnocchi plugin description * Removes Ceilometer plugin * Makes reference to Ceilometer in a demo generic * Adds link to collectd-ceiloemter plugin GSG for configuration instructions Change-Id: I87a68f943c6e30a9fbabd6e3742978ca064e0c7a Signed-off-by: Emma Foley <emma.l.foley@intel.com>
2017-07-18Update git submodulesliyin1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Bug fix: fit Yardstick 3.1 version. JIRA: BOTTLENECK-173 This patch will add a file to create some yardstick conf, Yardstick will use this file to manage output file type. Change-Id: I1d265af9f0b9b5132dc63c4d6d95d5bc194c7ff6 Signed-off-by: liyin <liyin11@huawei.com>
2017-07-18Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Update release note for Danube 3.0" - Update release note for Danube 3.0 Change-Id: I7474ad539fd3066010f804747bad2819deb5564b Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn> (cherry picked from commit 79f16fd2a2cd2ae6e93e0f18aa87f5c1a24354f2)
2017-07-18Update git submoduleswenjuan dong1-0/+0
* Update docs/submodules/doctor from branch 'master' - Merge "Added steps to enable Python 3 and Congress in README file" - Added steps to enable Python 3 and Congress in README file Change-Id: Ic880836931f3f00c9ff926c9e981b0d49c9a045e Signed-off-by: Bertrand Souville <souville@docomolab-euro.com>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - ci/deploy.sh: Do not pass SSH_KEY to Fuel deploy OPNFV Jenkins jobs for Fuel and Armband define the variable SSH_KEY, which gets passed down to Fuel's ci/deploy.sh, leading to a conflict between the original key and the destination key paths, which in the default case overlap, leading to a deploy-breaking fault. Fuel@OPNFV is not affected by this behavior due to a "sudo" call that does not pass down enviroment variables (i.e. without `-E`). Change-Id: I291966ee177d828bf1e59c213c9da40eae13ab6b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'master' - p/fuel: deploy: Allow non-root deploys Fuel@OPNFV's ci/deploy.sh script imposes a hard requirement on running as the root user, which can be refactored into a series of smaller requirements. Instead, relax the check to the ability to run sudo commands inside the script, and explicitly add sudo for the package installation commands. This also adds a requirement for the Jenkins user running the deploy to be part of the "kvm" and "libvirtd" groups, so libvirt/virsh can manage VMs on the jump server / Jenkins slave. See related change in OPNFV Releng repository [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/37655 Change-Id: I29b90d285c99f85462493c2a3890264365fca9f0 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-18Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - Revert "armband-deploy.sh: Inherit env vars for sudo" Using sudo triggers a chain of dependencies in our infrastructure, ranging from issues cleaning up the Jenkins workspace to deploy-time permission issues. As it turns out, cleaning all looses ends after that change is not a trivial task, and the remaining work outweights the benefits of using sudo in the first place. The original motivation for using sudo was a superposition of: - hardcoded check for running as root in Fuel's ci/deploy.sh; - the ability to install packages on the hosts via apt-get/yum; - the ability to spawn VMs using virt-manager; All of the above can be mitigated by imposing a series of restrictions for the Jenkins slave / jump server workstation and the jenkins user: - check for sudo rights instead of running as root user; - explicitly use sudo for package installation and/or system-level changes; - add jenkins user to "kvm" and "libvirtd" groups; So, revert using sudo when calling the deploy script, and limit sudo actions to package installation in Armband's deploy script. To compensate running as a regular user, a series of small changes is required in Armband project itself, together with the appropiate Jenkins slave user configuration on the machines running this script. This reverts commit 67d8bac7b2a97531ad465f275747b3dc455d4fe4. Change-Id: I88df6db1a43b93b7314ceca53d353f9000f15153 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-17Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/apex from branch 'master' - Merge "Fixes glance API running on incorrect network" - Fixes glance API running on incorrect network JIRA: APEX-476 Change-Id: If635b4187f082d723ad00ba82357b351ee596a18 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-07-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - armband-deploy.sh: Inherit env vars for sudo Previous commit adding sudo for ci/deploy.sh call breaks Armband deploys, since ci/deploy.sh relies on $WORKSPACE env var being set. Change-Id: I948c8e3c00b430e0c186c0a727e1b7e027d7a089 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-17Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/releng from branch 'master' - armband-deploy.sh: sudo ci/deploy.sh New MCP deploy scripts have a hard requirement on running as root. Bring back sudo for the `ci/deploy.sh` invocation, aligning with Fuel@OPNFV. NOTE: This can be later avoided/reverted if we can guarantee the "jenkins" user has sudo rights, even without a tty present. Change-Id: Ibec7b14e9174a7f482609890e5e68912931a8d05 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-17Update git submoduleszhifeng jiang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Add "NODE_NAME" in "envs" otherwise it will fails when docker run." - Add "NODE_NAME" in "envs" otherwise it will fails when docker run. Change-Id: Iad6330387dae9b2ad94522b000d2c1eed80fba0a Signed-off-by: zhifeng.jiang <jiang.zhifeng@zte.com.cn>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_base: speedup unittest, wait for queue not empty" - test_base: speedup unittest, wait for queue not empty Change-Id: I41a72b1fd7099e404a1cf832de39f15bbc7b46e0 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesSteven Pisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Merge "Created new class KeystoneException" - Created new class KeystoneException Raising KeystoneException in keystone_utils.py instead of Exception JIRA: SNAPS-127 Change-Id: Ife37c9df79c5c85dfdb07e239268c05b7c9a91bd Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-17Update git submodulesspisarski1-0/+0
* Update docs/submodules/snaps from branch 'master' - Created new class GlanceException. Raising GlanceException in glance_utils.py instead of Exception. JIRA: SNAPS-126 Change-Id: I11b2d9a1ff439c1a4a52b4be30584fe8af877c73 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
2017-07-17Update git submodulesBertrand Souville1-0/+0
* Update docs/submodules/doctor from branch 'master' - Updates upstream file (dataplane status to network port in Neutron) Change-Id: I00f232dede044ca396fe914272e7ade9ac9d6753 Signed-off-by: Bertrand Souville <souville@docomolab-euro.com>
2017-07-17Update git submodulesliyin1-0/+0
* Update docs/submodules/bottlenecks from branch 'master' - Bug fix of Bottlenecks can't use CLI JIRA: BOTTLENECK-171 Bug fix of Bottlenecks can't use CLI to start test. Some docker-compose function delete to fit elk docker support. After this patch you could use bottlenecks testcase run posca_factor_ping to start this test. you also need to put the rc file to bottlenecks docker. Change-Id: I340e31185a499c81f9595a902df89d8f0ddf0cd3 Signed-off-by: liyin <liyin11@huawei.com>
2017-07-17Update git submodulesjulien zhang1-0/+0
* Update docs/submodules/parser from branch 'master' - Merge "synchronize upstream about tosca-parser" - synchronize upstream about tosca-parser synchronize tosca-parser with version of 0.81 JIRA: PARSER-128 Change-Id: Ib00e391bd6c1f4c69776796eb7b28062f14b92fc Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-17Update git submodulesshangxdy1-0/+0
* Update docs/submodules/parser from branch 'master' - Synchronize upstream version of 0.9 Synchronize heat-translator wiht upstream versionn of 0.9 JIRA: PARSER-128 Change-Id: I4d2c62a0e81119d5c0305e3ac052415a6d5acee3 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-17Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Conform the RefStack testcase with the Rally context" - Conform the RefStack testcase with the Rally context If the RefStack testcase relies on the Tempest configuration generated by Rally, it must conforms with the related context [1]. [1] https://raw.githubusercontent.com/openstack/rally/0.9.1/rally/plugins/openstack/verification/tempest/context.py Change-Id: Ia62c0a328c53a1541aeaf8668e1f34ae67898eed Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-17Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Wait for refstack-client to finish" - Wait for refstack-client to finish The previous implementation waited for /bin/sh to finish instead of refstack-client. Then tempest still ran in background even if the tescase was considered as finished. Now all tempest logs are only printed in the dedicated file. Change-Id: I94cd7c6fe68f3bc21782d8d9c43feee338c103ae Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
2017-07-17Update git submodulesDeepak S1-0/+0
* Update docs/submodules/samplevnf from branch 'master' - Merge "Documentation Compliance for Euphrates - Adding template" - Documentation Compliance for Euphrates - Adding template JIRA: SAMPLEVNF-57 Change-Id: Iccbbe17fb06044af9a53d3207b0ee7679b57ce66 Signed-off-by: Deepak S <deepak.s@linux.intel.com>
2017-07-17Update git submodulesDeepak S1-0/+0
* Update docs/submodules/samplevnf from branch 'master' - Merge "docs: Update install and release docs for DPDK migration support" - docs: Update install and release docs for DPDK migration support JIRA: SAMPLEVNF-48 Updating INSTALL.rst and RELEASE_NOTES.rst for DPDK migration support. The additional files are created to make it as per the opnfv document standard to generate the html files. Change-Id: I4b0af4c3afeef91fc806285b02c0ce47d61ebfbd Signed-off-by: Anand B Jyoti <anand.b.jyoti@intel.com>
2017-07-17Update git submodulesxiaodong shang1-0/+0
* Update docs/submodules/parser from branch 'master' - Merge "Add more test for nested import list" - Add more test for nested import list Currently the test about nested import list is not enough, the patch enhance the test. Change-Id: Ica25345062d316b9a32f4efb8c5c2a98b8bda497 JIRA: PARSER-127 Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
2017-07-17Update git submodulesYujun Zhang1-0/+0
* Update docs/submodules/qtip from branch 'master' - Merge "Add further enhancements into compute-report" - Add further enhancements into compute-report - Show results for all sections - Rotate x-axis to 45 degree to avoid overlap Change-Id: Id30b11937a27d3c6fff2b8ad8c9bf3aefbddb404 Signed-off-by: Taseer Ahmed <taseer94@gmail.com>
2017-07-17Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/releng from branch 'master' - Merge "[Functest] Adapt set-functest-env to download OS images" - [Functest] Adapt set-functest-env to download OS images When [1] is ready and merged, we don't need to download the OS images that are not needed for the deployed scenario. The same filter applies to armband jobs. [1] https://gerrit.opnfv.org/gerrit/#/c/37373/ Change-Id: I5813c738a8d9fa1262299cc50993557757f6d7e8 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-07-17Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'master' - Merge "Remove add_images.sh" - Remove add_images.sh The Docker images should not host any OS image. They shall be pre-downloaded and mounted as a docker volume to the functest container. Also, add scenario argument to skip images that are not needed for the scenario Change-Id: I652ec32b177ddea73c8a253359e873f13bf0c950 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-07-17Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "attacker_process: fix typo s/envrioment/environment/" - attacker_process: fix typo s/envrioment/environment/ Change-Id: I1e5db657eb88c73b5d9223c47e2d97dc79eec1f1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_nstat: speedup unittests, sleep for 0 seconds" - test_nstat: speedup unittests, sleep for 0 seconds Change-Id: I3f961e26fb045ea7501dc3a5b630b3ef94fec3ee Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "pktgen: speedup unittest, mock time.sleep" - pktgen: speedup unittest, mock time.sleep Change-Id: I0c6f6b68b30ae72887666a3b9e994dabf7c6a71d Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesDeepak S1-0/+0
* Update docs/submodules/samplevnf from branch 'master' - Merge "[UDP_Replay] fixing of compiler warning" - [UDP_Replay] fixing of compiler warning removes the nb_lcores as its no longer used. Change-Id: I13020585afb6d1e0758f1efc6578740dd3502d72 Signed-off-by: Vishwesh M Rudramuni <vishwesh.m.rudramuni@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "tg: speedup unittests, mock time.sleep" - tg: speedup unittests, mock time.sleep Change-Id: Ia6207c898653c3ba21b22e9c309e7abb25d5cd32 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - Merge "test_pktgen_dpdk_throughput: speedup unittest, mock time.sleep()" - test_pktgen_dpdk_throughput: speedup unittest, mock time.sleep() Change-Id: I74bbdee1a503ef9bad32db7d4444921f6730f465 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-07-17Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'master' - test_heat: ipaddress expects unicode inputs 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>