summaryrefslogtreecommitdiffstats
path: root/docs
AgeCommit message (Collapse)AuthorFilesLines
2017-07-13Update git submodulesjuraj.linkes1-0/+0
* Update docs/submodules/fds from branch 'stable/danube' - Updated release notes for Danube 3.0 Change-Id: Ifd4219edcb10bd367b500e7316418e1b1461b887 Signed-off-by: juraj.linkes <jlinkes@cisco.com>
2017-07-13Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/fuel from branch 'stable/danube' - docs: Update release date Change-Id: I4a1399f40842fa9a3c3c081738eadb76ae840e60 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-13Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/danube' - docs: Update release date Change-Id: Iff658e7332d6f5a398d3d472accb39501943cc01 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2017-07-13Update git submodulesNikolas Hermanns1-0/+0
* Update docs/submodules/sdnvpn from branch 'stable/danube' - [docs] Adding apex deployment config guide JIRA: SDNVPN-171 Change-Id: I076a087ab346e8e6e3063c958fefff657838b708 Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com> (cherry picked from commit 38d1895faf9aaeefa6b64df6f4d149a00884b09b)
2017-07-13Update git submodulespanageo21-0/+0
* Update docs/submodules/sdnvpn from branch 'stable/danube' - Update release notes Uplifting docs to D-3. Update release-notes to reflect the remaining issues we have not been able to resolve. JIRA: SDNVPN-169 Change-Id: I5997f1495fc37ecbc06a8c7b8071a7ba7f2c099c Signed-off-by: panageo2 <panageo@intracom-telecom.com>
2017-07-11Update git submodulesMartin Kulhavy1-0/+0
* Update docs/submodules/joid from branch 'stable/danube' - Fix space gateway processing from JSON The gateway addresses for public and storage spaces were collected from wrong values. Change-Id: I94234b9c3d3493d9e1eda5b8a0333064f3f0bb73 Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>
2017-07-11Update git submodulesroot1-0/+0
* Update docs/submodules/sfc from branch 'stable/danube' - Fix missing argument in wait_for_classification_rules Change-Id: I4b41608ae7f91f51bd55d80c4e57b7e59e94855a Signed-off-by: Juan Vidal Allende <juan.vidal.allende@ericsson.com>
2017-07-05Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'stable/danube' - Upgrade networking-sfc to 3.0.0 JIRA: - In openstack newton, the version of networking-sfc should be 3.0.0. Otherwise after neutron db upgrading, the sfc related tables cannnot be written into neutron db. Change-Id: Iceb17b5f9351d66ba43148211fcc5af053f63e39 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2017-07-05Update git submodulesjose.lausuch1-0/+0
* Update docs/submodules/functest from branch 'stable/danube' - Switch to mitaka-eol tag in networking-bgpvpn Mitaka is EOL [1] and the Openstack practice is to remove the corresponding stable branch. [1] https://releases.openstack.org Change-Id: Iba37e8839435fa645d0c05bfc4a5453b3da87686 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-07-05Update git submodulesLinda Wang1-0/+0
* Update docs/submodules/functest from branch 'stable/danube' - Update the link to firewall_block_image.img As the link http://205.177.226.237:9999/onosfw/firewall_block_image.img has been deprecated, now the valid link is updated, aiming at running the testcase onos_sfc. JIRA: FUNCTEST-820 Change-Id: Id848e3ab92c3b0fb47e3c755d203844dd94d8408 Signed-off-by: Linda Wang <wangwulin@huawei.com>
2017-07-05Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Use "OS_INSECURE" variable as the insecure mode indicator Now we use "OS_CACERT" as the insecure mode indicator, it is better to use "OS_INSECURE". Change-Id: I1406193e27510390b4b8fd8f4751d8361560172f Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit a2176af5514fc55ad8421635ad70ce4f26890ed6)
2017-07-03Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Bugfix: amend the CLI to build yardstick-image manually Change-Id: I8fbf0d6383375660c05e55d36fb0d2f91e1d8de8 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-07-03Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Set TEST_DB_URL for storperf JIRA: YARDSTICK-692 add the URL for the test results DB to the storperd_admin-rc TEST_DB_URL=http://testresults.opnfv.org/test/api/v1 Also, add metadata JSON to the POST to /job API when creating the job: Change-Id: Ib950f759d80e707bc49d9015bc120d985051f131 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit 1c69f20b0f681ea66d68d077c7f85466363fee4d)
2017-07-03Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - increase line length to 99 When line length is 79 I have to spend too much time manually wrapping my code into unreadable junk I can't use expressive tuple unpacking and I start shortening variables and other bad tricks to decrease the line length. We have too many levels of indent to manage with 79 class: def: if: for: etc. Change-Id: Ib2ce9cf887f9880c46815822c8d0e1a7806e53ca Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 98fdb2810a7010edf0f12af0ed5d706df2af615c)
2017-06-30Update git submoduleszshi1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Bugfix: remove test.dbf file in recovery script JIRA: YARDSTICK-696 Change-Id: I09b73079ff828c43040723794115bb07f74242e8 Signed-off-by: zshi <zshi@redhat.com> (cherry picked from commit d578927cd63784616f11c4d669815192fd5fa336)
2017-06-29Update git submodulesJose Lausuch1-0/+0
* Update docs/submodules/functest from branch 'stable/danube' - Merge "Increase timeout of Open Baton installation" into stable/danube - Increase timeout of Open Baton installation Change-Id: Ifdc24a3fc9e2c315b41f9e68bccb88df36252b0c JIRA: ORCHESTRA-14 Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de> Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
2017-06-29Update git submodulesjuraj.linkes1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Remove workaround for vhost-user binding A fix (https://review.openstack.org/#/c/476947/) for bug https://bugs.launchpad.net/networking-odl/+bug/1696968 has already been merged, no need for this workaround anymore. Change-Id: I8e0657e8cf8dcd2045015e086fe591ec50da62d3 Signed-off-by: juraj.linkes <jlinkes@cisco.com>
2017-06-29Update git submodulestomsou1-0/+0
* Update docs/submodules/sdnvpn from branch 'stable/danube' - Uplifting docs to D-3 Change-Id: Iff2f924886bae8e4bf84f4325cde3d7f8546b487 Signed-off-by: tomsou <soth@intracom-telecom.com> (cherry picked from commit 82a6d6e756177273c94f64e675bf196989479028)
2017-06-28Update git submodulesJing Zhang1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Add SRIOV support A generic provider network solution is introduced. To identify whether a network specified in the test case is a provider network new attributes are introduced in the test case network section: networks: test-net: cidr: '192.168.1.0/24' provider: "sriov" physical_network: 'physnet1' If the "provider" attribute is present, the network is an existing provider network. If the value is "sriov", binding:vnic_type=direct is added to the interface in the heat deployment template. In orchestrator/heat.py, the interface creating functions are given a new parameter that tells if the network in use is a provider network. The benchmark/contexts/model.py is changed to store the value of the provider attribute from the test case and function calls to port creation is updated with the provider parameter. The same change is made in contexts/heat.py as well. Also calls for creating a new tenant network is replaced for creating a new provider network if the provider attribute is present. Update-1: Change test_model.py Update-2: Per comment, change comment style to """" Update-3: Change test_heat.py Update-4: Add unit test cases to pass coverage test Update-5: Add SRIOV provider network example in opnfv_yardstick_tc008.yaml Update-6: Per comment, remove empty line in orchestrator/test_heat.py Update-7: Per comment, change comment lines in orchestrator/test_heat.py Update-8: Add more unit test cases to pass coverage test Update-9: Change to create SRIOV provider network on the fly so as to support co-current test runs Update-10: Per comment, init physical_network to 'physnet1' Change-Id: I76004c4fcc9bffcfd8ed021fd647e0cecb346ef4 JIRA: YARDSTICK-612 Signed-off-by: Jing Zhang <jing.c.zhang@nokia.com> (cherry picked from commit f51ba41255d6ab2c03fd62a044d372b73b496459)
2017-06-28Update git submodulesrexlee87761-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Bugfix: cacert should suppot insecure mode if needed currently, we use env variable "OS_CACERT" to specify the location of cert file. but if there's no cacert and use for personal verification, it's better to also support insecure mode by set OS_CACERT=False JIRA: YARDSTICK-616 Change-Id: I73b0860863bf6386f9114328c52594ef87e02fa3 Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit aa477334a3cb2e49c4343f66bff44c89d7edcf24)
2017-06-27Update git submodulesjuraj.linkes1-0/+0
* Update docs/submodules/functest from branch 'stable/danube' - Updated fds testcase criteria Initially, we only executed fds testcase on odl_l2 fdio scenarios. Now we're extending this to all odl fdio scenarios. Change-Id: Ieb2454f02847361fdf3274b11f20a996a916ad90 Signed-off-by: juraj.linkes <jlinkes@cisco.com>
2017-06-27Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Pin puppet-opendaylight for puppet 3.8 compatibility Change-Id: Ib9052fafd601c7b269f0f6a3e98d83e63b07f12f Signed-off-by: Feng Pan <fpan@redhat.com>
2017-06-27Update git submodulesjuraj.linkes1-0/+0
* Update docs/submodules/fds from branch 'stable/danube' - Updated robot scripts for v3 credentials The fds security group robot script is now compatible with both v2 and v3 credentials. Also introduced other minor fixes. Change-Id: I987a3963fea425fcc31afe4681575ca985f162bb Signed-off-by: juraj.linkes <jlinkes@cisco.com>
2017-06-27Update git submodulesMorgan Richomme1-0/+0
* Update docs/submodules/functest from branch 'stable/danube' - Merge "Remove Domino from apex/Danube" into stable/danube - Remove Domino from apex/Danube Change-Id: Iba8bb7b1df1686b1bba8f8e2fe8c4c6e2a88d44c Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
2017-06-26Update git submodulesMichael Pauls1-0/+0
* Update docs/submodules/functest from branch 'stable/danube' - Fix VIM onboarding and ims deployment VIM onboarding: check for API version of OpenStack -> support of v2 and v3 ims deployment: fix userdata in order to wait for EMS registration Change-Id: Id0932232ddb1f1163ef3c37460bc88b71b9c0bdd Signed-off-by: Michael Pauls <michael.pauls@fokus.fraunhofer.de> (cherry picked from commit 0cbe545a4ebda5b37b682b46d849198648a7efe1)
2017-06-26Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Bugfix: remove double quote around SECURE variable JIRA: YARDSTICK-689 This patch remove the double quote around the SECURE varibale as it may cause the fowllowing error: $ openstack "${SECURE}" image list openstack: ' image list' is not an openstack command. See 'openstack --help'. Did you mean one of these? access token create address scope create address scope delete address scope list address scope set address scope show aggregate add host aggregate create ... Change-Id: Ibb22e85b3dd89b0e3b62821bd5ebe4f155886ffc Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit b04755b5148daf36db436dc066e1bef2c93f1879)
2017-06-24Update git submodulesJingLu51-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Improve Yardstick user-guide This patch adds a short description on how to use the "yardstick env prepare" command in a Non-OPNFV installer environtment. Change-Id: Idf54bf5318499d2b129a1445e0758e351945e755 Signed-off-by: JingLu5 <lvjing5@huawei.com>
2017-06-23Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Merge "HA testcase improvement" into stable/danube - HA testcase improvement This patch improve HA test case in the following aspects: 1. the "GeneralHA" type now will check if the target service process in the controller node. 2. support ignore server certificate 3. add debug log for recovering service failed 4. improve method to kill keystone process Change-Id: I9ae7ab54391fe41d5d7f3e4951a7ac2e3ba75968 Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit 5b99f1532ec4d15258ec86e970acd2904954b3bc)
2017-06-22Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Merge "temp freeze releng version for stable/danube workaround" into stable/danube - temp freeze releng version for stable/danube workaround releng doesn't have a branch, so we need to freeze the releng version. There is an issue with releng fetch_os_creds.sh change /home/opnfv/repos/releng/utils/fetch_os_creds.sh: line 75: BRANCH: unbound variable So we need to revert back to commit before this change Change-Id: Ie8b0f68879a873aab584aa32b576d8b5ba602a13 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-22Update git submodulesrexlee87761-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - bugfix: storperf timeout in ci JIRA: YARDSTICK-680 Change-Id: Ie405187b8ab085a9e4f40a7e7e7e661c94e83630 Signed-off-by: rexlee8776 <limingjiang@huawei.com> (cherry picked from commit 6552d3b7b08c3b9dcaa8f44adc31d5028c00e863)
2017-06-22Update git submodulesAlexandru Avadanii1-0/+0
* Update docs/submodules/armband from branch 'stable/danube' - docs: Update release date Change-Id: I659946aef133af3b99120903d57527daccf67f53 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit be00c803bcefb56ad9f690ae1509d3dcae7e9d9b)
2017-06-22Update git submodulesRex Lee1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Merge "Adapt lmbench scripts for aarch64 nodes" into stable/danube - Adapt lmbench scripts for aarch64 nodes LMBench shell scripts were invoking x86_64 executables. This made them fail when executed on aarch64 nodes. Added architecture detection and proper command call. JIRA: ARMBAND-268 Change-Id: I8c9e87158631f7f5479adc2fda9558f9f7e54406 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com> (cherry picked from commit fd2b3173d21d34720f714e7e6358dafe7d1ada12)
2017-06-22Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Merge "improve git code with devstack functions" into stable/danube - improve git code with devstack functions if we aren't re-cloning we still need to make sure we update the branch/tag/commit to the version from the remote so we need to fetch and then checkout again it is more complicated. Dockerfile does a shallow clone, so we don't get all the remote ref information. To clone a random remote commit id we have to unshallow Change-Id: If15f504b6ff2cfdfc8894fd3b37e687a19616714 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
2017-06-22Update git submodulesRoss Brattain1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - ping: don't split if target_vm is a dict If we run sample/ping-hot.yaml, it will encounter an AttributeError, log see below: Traceback (most recent call last): File "/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/runners/duration.py", line 69, in _worker_process method(data) File "/usr/local/lib/python2.7/dist-packages/yardstick/benchmark/scenarios/networking/ping.py", line 94, in run target_vm_name = target_vm.split('.')[0] AttributeError: 'dict' object has no attribute 'split' Because here host and target will be a dict JIRA: YARDSTICK-561 Change-Id: I4b7628bf20050d6d516a80efe3785f750d27c05e Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit eb142a953a59f447f1c186d2f58004fe354e4c4b)
2017-06-22Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Fixes glance API running on incorrect network JIRA: APEX-476 Change-Id: If635b4187f082d723ad00ba82357b351ee596a18 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-06-22Update git submodulesyuyang1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/danube' - Docs for Danube 3 JIRA: BOTTLENECKS-137 Documentation for Danube 3 Change-Id: Ic4b2611028fa45c0b731e998296e5000e35a33f6 Signed-off-by: yuyang <Gabriel.yuyang@huawei.com> (cherry picked from commit 38074a81bcb2a97bd59f274815dbfa67ab487c59)
2017-06-21Update git submodulesAlexandru Nemes1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Configure Yardstick flavor to give more RAM to ARM instances Yardstick TC005 fails with errors that indicate low memory conditions: "fio: error while loading shared libraries: librbd.so.1: cannot map zero-fill pages" Changing the yardstick flavor to give 1024MB of RAM instead of 512MB made this test case work. JIRA: ARMBAND-275 Change-Id: I2193802082c28edb20004964d2df3780eb5eccb7 Signed-off-by: Alexandru Nemes <alexandru.nemes@enea.com> (cherry picked from commit 5c8e38667e17059db1c62dd21f868966a6b2a519)
2017-06-21Update git submodulesMichael Polenchuk1-0/+0
* Update docs/submodules/fuel from branch 'stable/danube' - [docs] Refresh reference for Danube 3.0 Change-Id: I16154a1407b12c762a2866322b1ef4216a34dde2 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2017-06-21Update git submodulesFeng Pan1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Fix syntax error in ovs-dpdk-preconfig.yaml JIRA: APEX-477 Change-Id: I58988755519117b39fe96be6c619489155d01b81 Signed-off-by: Feng Pan <fpan@redhat.com>
2017-06-20Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Merge "Workaround for vhost-user binding" into stable/danube - Workaround for vhost-user binding This is a workaround for this bug: https://bugs.launchpad.net/networking-odl/+bug/1696968 JIRA: APEX-475 Change-Id: Ic115e094c2906d6572d6af411872d5584e665aec Signed-off-by: juraj.linkes <jlinkes@cisco.com>
2017-06-20Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Fixes ODL config to step 1 only opnfv-puppet-tripleo-pr: 30 JIRA: APEX-473 Change-Id: I96dbe8c467db6b72df6d82e3575567a6c4d4da70 Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-06-20Update git submodulesjuraj.linkes1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Fixes missing SDN_CONTROLLER_IP in overcloudrc.v3 JIRA: APEX-474 Change-Id: Iadc8e1614161421ae32b25e3cf10e1b5ba599250 Signed-off-by: juraj.linkes <jlinkes@cisco.com>
2017-06-20Update git submodulesJing Lu1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Merge "Terminate openstack service process using kill command in HA test cases" into stable/danube - Terminate openstack service process using kill command in HA test cases JIRA: YARDSTICK-659 In some openstack environment, the service process cannot be killed by killall command but can be terminate by kill command. This patch is about to switch to use kill command in the fault_process_kill.bash to kill processes. Change-Id: Iec455ee56d3f31fb5c16de5994870d1acd33f41a Signed-off-by: JingLu5 <lvjing5@huawei.com> (cherry picked from commit dd42ba3cafb908246da5b90c8bbbc2c7d0beb801)
2017-06-20Update git submodulestjuyinkanglin1-0/+0
* Update docs/submodules/yardstick from branch 'stable/danube' - Fix configuration error in TC025 JIRA: YARDSTICK-647 Change-Id: Idc2a87d20a631c37f151cc945de155ef8855e9c3 Signed-off-by: tjuyinkanglin <14_ykl@tongji.edu.cn> (cherry picked from commit c076c8372f32a88059783fbc993ab2ebb8967e2e)
2017-06-20Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'stable/danube' - Merge "Up br-external after its creation" into stable/danube - Up br-external after its creation JIRA: - On a clean env run compass4nfv deploy script will cause the jumpserver network unreachable. This patch fix this issue. Change-Id: Ib04762c5cf745ab40adcf05497d518e6d86ad97c Signed-off-by: QiLiang <liangqi1@huawei.com> (cherry picked from commit a6b71efaef32cd9b43abb48f0a0084465bd435dc)
2017-06-19Update git submodulesyuyang1-0/+0
* Update docs/submodules/bottlenecks from branch 'stable/danube' - Remove redundant print functions JIRA: BOTTLENECK-158 Remove redundant print functions for report log Change-Id: I35c43fd3e30090bc296823faca55b49c0431a1fb Signed-off-by: yuyang <Gabriel.yuyang@huawei.com> (cherry picked from commit 6de46e9144ee0bc2962460c600e4b3a888d934ef)
2017-06-15Update git submodulesJustin chi1-0/+0
* Update docs/submodules/compass4nfv from branch 'stable/danube' - Merge "FIX compass-core vm panic issue" into stable/danube - FIX compass-core vm panic issue JIRA: - Update compass-core vm cpu mode in libvirt xml to let compass-core vm support most instruction set that host support. Change-Id: I654672f441c18e0da87509d3c492ceae2bf9ba95 Signed-off-by: QiLiang <liangqi1@huawei.com>
2017-06-15Update git submodulesYifei Xue1-0/+0
* Update docs/submodules/compass4nfv from branch 'stable/danube' - Switch on onos-sfc scenario for CI Change-Id: I23d03618bbfe53f188f594deabb8bc70453c73b9 Signed-off-by: Yifei Xue <xueyifei@huawei.com>
2017-06-12Update git submodulesTim Rozet1-0/+0
* Update docs/submodules/apex from branch 'stable/danube' - Fixes vars missing in overcloudrc.v3 Change-Id: I03df4973fe2bb1356719dda5666484f556df2ffa Signed-off-by: Tim Rozet <trozet@redhat.com>
2017-06-09Update git submodulesmbeierl1-0/+0
* Update docs/submodules/storperf from branch 'stable/danube' - Allow Filename Target Changes the default filesize to 1g so that profiling a file works again Change-Id: I060b7af75be08f4ffb411f1c612babb846172dd5 JIRA: STORPERF-153 Signed-off-by: mbeierl <mark.beierl@dell.com> (cherry picked from commit c8c1bc3cf1895c28d9d5cbfaff7ec80ed95b93b8)