summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2016-09-16Update documentation with AArch64 specificscristinapauna9-102/+186
The documentationfrom Fuel was introduced to armband project by https://gerrit.opnfv.org/gerrit/#/c/20679/ This patch updates it with aarch64 specifics Change-Id: I05eccef015fd399e7d05a0505e85e733a8e95f1d Signed-off-by: cristinapauna <cristina.pauna@enea.com> (cherry picked from commit 5bd99052ed055c76efbc479f00edb09b5780cb56)
2016-09-16docs: Copy OPNFV docs dir as documentation basecristinapauna50-881/+474
There has been some restructuring of the documentation in fuel project. This commit copies those files, while a subsequent commit will adapt the documentation with aarch64 specifics. Change-Id: I56b52d5d16975b88fd5b26099b43046c6a5d5747 Signed-off-by: cristinapauna <cristina.pauna@enea.com> (cherry picked from commit b832a3e82070e12dff555e2a83d604de7e398acb)
2016-09-15fuel-plugin-ovs: Simplify debian version stringsAlexandru Avadanii4-103/+118
Remove all suffixes from OVS debian packages, and simplify the plugin code handling the fetching of said packages. While at it, enable: - local mirror caches, by mounting /etc/hosts in the docker builder - HACK: mismatch between debian source versions and debian binaries Related-bug: ARMBAND-89 Change-Id: Ifbf0e11c90cf7b2f76ce72af8ca3469a33bee071 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6be5639d8ce2f6e282db6f3d19699a341b9b491c)
2016-09-15Updated armbandbillyom1-0/+0
Project: fuel b90311bf3240c0f57ee747e6cf3e57e07a6cf5fa Uplift fuel-plugin-ovs Pull in "Update flavors mem_page_size" Change-Id: I3e285cefee561dbbc02eb9ab7d2e9c01eef2742a Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-15Updated armbandMichal Skalski1-0/+0
Project: fuel f8337987d6feab6674ce05508c321ac30ef996a3 Use Boron RC3.5 for sfc scenarion It should fix problems with vm communication through floating IPs. Change-Id: Icadc71f2b99c28715c15389e59111272a21440fb Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit ff9c24257a2c62dd981297a92eecf712f6643617)
2016-09-14AArch64: fuel-plugin-ovs enableAlexandru Avadanii9-1/+1069
OVS-DPDK-NSH is not supported on arm64 for now, see [1] Closes: ARMBAND-46 [1] https://jira.opnfv.org/browse/ARMBAND-86 Change-Id: I79b33bab7348e297c06ff4bb2bf7cc23f21eb7e3 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 5b49b2f7ea1485b56ebc7815b5a3803363ec29af)
2016-09-14Updated armbandMichal Skalski1-0/+0
Project: fuel 098c34d407f71df6f29cd70b0c8381c9522c71b2 Update local mirrors defintions If we only use main section, not all required packages are discovered. Change-Id: I2eaa4a7bfc659b820901ce55a4ab799c3281df3b Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 2e9ff14f8ab6ee9e4ebf84a2e8e40bd3f149c48e)
2016-09-13Revert "patches, docs: Remove MySQL WSREP SST provider"Alexandru Avadanii4-0/+126
This reverts commit 8a696682b3fd0cb5f32ddaca8ede5db7b001a57f. Change-Id: Ib1698643639436243768f4a8209c4d68314a97ca (cherry picked from commit f5e0922b9282dccb5d79c80c58801f455495c4ce)
2016-09-13Updated armbandJonas Bjurel1-0/+0
Project: fuel acdc36531e0b6ae2449ea7dfef58addb8786acb1 Add intel-sc lab devel-pipeline configuration intel-sc is the lab devel-pipeline configuration for a lab of Intel in Santa Clara, CA, USA. This lab is behind Intel proxy sever. Change-Id: I401b030adf82d6a19397e92aef4b30ebe971d80c Signed-off-by: davidjchou <david.j.chou@intel.com> (cherry picked from commit 8079d1237ab9f2326adef163dc509c8a84e62775)
2016-09-13Updated armbandwu.zhihui1-0/+0
Project: fuel 72248b41f0f26b0daaacb5a61623f2f7f0f4a9b5 update node_reset() in zte_adapter.py Change-Id: I71790b8abb25936045f777a78ed903f3b8ce4303 Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn> (cherry picked from commit 161dd445f06aa9a5dfcd273d89a00d1f02260ba3)
2016-09-12Updated armbandMichal Skalski1-0/+0
Project: fuel 5bd3673cb88408f13b7d84d4c09462cb15816476 Reduce ceilometer memory usage JIRA: FUEL-189 Change-Id: I54854e4cc87f0c0e9e348e18131aa88b70e30054 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com> (cherry picked from commit 4c47ef4b6f192482d99196c7a7070e5f396b1fd5)
2016-09-12Updated armbandMichal Skalski1-0/+0
Project: fuel 35cea158cb9fe9c8780bc9d90871b2ed64e4ccbe Change the way of hugepage allocation Try to allocate enough hugepages for all NUMA nodes. JIRA: FUEL-186 Change-Id: Idcdf6ab616dfbd9ef1104be8d1667421221ea5f2 Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 8d7559b50b265298f7800b18f840b87ad1e84b20)
2016-09-11fuel-library: mysql: Fix spurious install timeoutsAlexandru Avadanii2-0/+150
Backport the following fuel-library fixes from Fuel 9.1: - wrong relationship in clusters mysql manifest - Rsyslog doesn't have write permission to /var/log/mysql/ directory These two bugs manifested as: - random deploy issues waiting for MySQL to sync, without the server being installed; - no MySQL logs were saved due to permission issues; Closes-bug: ARMBAND-78 Change-Id: I317e45d013229145e2ccbd8bb4f76ae03d544098 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b5331973a5c755d1612d37d82841db5a98288489)
2016-09-09FIXME: deploy: EFI: Skip re-ordering boot via IPMIAlexandru Avadanii1-0/+31
On EFI systems deploys, altering the boot order via IPMI causes issues on some specific targets. Until we agree on an uniform solution for EFI systems + IPMI boot order handling, just skip altering it via IPMI. Related-bug: ARMBAND-71 Change-Id: I7790e1e8e3540d5ab10b8d7165316a04cf58faa4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 946e599b00d0e9ebccb12eb0071eb25343ca3fac)
2016-09-08deploy: x2 timeout for fuel master installAlexandru Avadanii1-4/+10
Change-Id: I1281b0b6b9d631e371484795a53113032ebbc83c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 7561f5f237a6abf84f7fd8adff94069906aded95)
2016-09-07Updated armbandGuo Ruijing1-0/+0
Project: fuel e07d06641a1bd5edc43eacc70bac75f824ea99ad Disable cpu features in ovs with DPDK Change-Id: I2cf5df2f0469f21f64e0e7d11740058639f68697 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> (cherry picked from commit 9a3f6a38d708cbc3633d203e36e32bc91764ba20)
2016-09-07Updated armbandMaryam Tahhan1-0/+0
Project: vswitchperf c4ba1cd1c33938ab54b217599d7ed9d9259a6caa docs: Fix links and formatting Documentation was updated as follows: * links were updated to refer to documentation specific for Colorado release * section decorators were fixed in LTD * links to testcase and deployment descriptions were fixed * duplicate labels removed from LTP&LTD * fixed typos in formatting and text * links to scalability and stress tests fixed after their renaming JIRA: VSPERF-349 Change-Id: I8b1d7a0220d637a684e70a788dd88250c646124e Signed-off-by: Martin Klozik <martinx.klozik@intel.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Al Morton <acmorton@att.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Bill Michalowski <bmichalo@redhat.com>
2016-09-06build: ubuntu mirror: blacklist another SE mirrorAlexandru Avadanii1-3/+6
SE mirrors are acting up lately, blacklist them: - ftp.availo.se - ftp.lysator.liu.se Change-Id: If4cc7c207fa7ce39821cc8a8f754a48f573ff374 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 812b9c2aee17342b5ba00f53b45cbc721fc4adef)
2016-09-06Merge "deploy: Attempt fixing random deploy timeouts" into stable/coloradoAlexandru Avadanii1-4/+5
2016-09-06Revert "EFI: Move patches to Fuel@OPNFV, upstream prep"Alexandru Avadanii4-198/+157
This reverts commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7. Change-Id: I317e0f6aa7665c28035307149e6e7d42fdf508f3 (cherry picked from commit 441caa623edf47dcf8944ed11aa3c193897dcf72)
2016-09-06Merge "Revert "submodule: Kill fuel-astute"" into stable/coloradoAlexandru Avadanii4-1/+9
2016-09-06Revert "submodule: Kill fuel-astute"Alexandru Avadanii4-1/+9
This reverts commit 41fc21bb87ee0ab245e8f6ada2ce49a45d633ede. Change-Id: I0f60787acc445555b255a92671ccf0ffe8610f78
2016-09-06Updated armbandferenc Cserepkei1-0/+0
Project: fuel 1dfcb4b452230c0d66892f3a373c299d2c46021b Script updates for CI job Due to the redesign of the SFC feature test, the poc script became part of CI job functest-fuel-baremetal, scenario os_odl_l2-sfc-ha, there is a need of full uplift to colorado. Changes: - GPG keyserver use (line 61) - patch updated fixing the debian package dependency issue (python-oslo.messaging-) - some typos are fixed - OpenDayLight address is read from hiera (management vip) Change-Id: I4a19ec753a575220cf321819ab4ff2d9433ec16c Signed-off-by: ferenc Cserepkei <ferenc.cserepkei@ericsson.com> (cherry picked from commit ad0dd57dc045b58c46e53f281ab57e70d00947d7)
2016-09-06Updated armbandJonas Bjurel1-0/+0
Project: fuel b10ada83fcf236e1d3f0e181b3b551e45c39a0c4 Final Colorado document review. - Please review the rendered HTML document (See Jenkins references below) - Please verify the documented procedures and instructions READY TO MERGE Change-Id: Idff52212ca68ce2b97f203043e18a18c582589a7 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
2016-09-05Rebase: fuel-mirror upstream changesAlexandru Avadanii1-3/+1
Slight rebase after upstream change [1]. FIXME: While looking at [1], I noticed that Armband is not using the proper fuel-mirror version due to our divergent patch & build system. This should be fixed later. [1] https://gerrit.opnfv.org/gerrit/#/c/20317/ Change-Id: I55798ba1004312cd737b6613744683437e98865a (cherry picked from commit b4d5044e751801507738dc02d116436d909d2248) Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2016-09-05submodule: Kill fuel-astuteAlexandru Avadanii4-9/+1
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 376c76d05862ed38edeb217cd9480807571491a7) Change-Id: I376c76d05862ed38edeb217cd9480807571491a7
2016-09-05EFI: Move patches to Fuel@OPNFV, upstream prepAlexandru Avadanii4-157/+198
Now we can kill fuel-astute submodule. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit dff8f1a78db4a04dd30c2e0ac03a36cb0b198aa7) Change-Id: Ie049062bb7a41adfbb056894c0a6f411a2d8c254
2016-09-05Updated armbandMichal Skalski1-0/+0
Project: fuel 83cc51d849d44b4d337922cedab27645a25afcfb Do not use rsync for choosing mirror server Rsync protocol was used for creating local mirrors, but now we only need http connection. This requirement can be problematic for environments which are behind proxy and can lead to build failures when rsync is not allowed. Change-Id: I4efcf500fd0c25de5fdb87307e7210cc4a96714d Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit a8820e25b80ee0c069e473cb54c576d98dd10aee)
2016-09-05Updated armbandMichal Skalski1-0/+0
Project: fuel e49332ee58cb465c7aa95f967361c20c509b7619 Change source of ODL Boron tarball For SFC scenario we need to use ODL Boron. Since it is not yet released there is no persistent location for a tarball. Use opnfv artifacts to store Boron build which include required changes. Change-Id: I43e35dbdf5ca0160d48a1adc817db071fd5db85d Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit 9d871421fbc631f875f7a8bdca590b42eb1bd3bf)
2016-09-02Updated armbandAl Morton1-0/+0
Project: vswitchperf a12a717991c17abbbd298dff4f19d25f92c4f971 test_spec: Remove formatted text file verions of IETF Draft Remove files with IETF copyrights (Internet Draft .txt files). I assume these files have to be removed in C-stable branch... JIRA: VSPERF-387 Change-Id: I03e09a6db71067f8872d653da6280b4d829fae51 Signed-off-by: Al Morton <acmorton@att.com> Reviewed-by: Maryam Tahhan <maryam.tahhan@intel.com> Reviewed-by: Bill Michalowski <bmichalo@redhat.com> Reviewed-by: Christian Trautman <ctrautma@redhat.com> Reviewed-by: Antonio Fischetti <antonio.fischetti@intel.com> Reviewed-by: Martin Klozik <martinx.klozik@intel.com>
2016-09-02patches, docs: Remove MySQL WSREP SST providerAlexandru Avadanii4-126/+0
xtrabackup issues have been fixed with the latest version of percona-xtrabackup DEBs we added to linux.enea.com, so remove MySQL WSREP SST provider patches and corresponding docs. Closes-bug: ARMBAND-52 Change-Id: I743e9b6ed242cf15e3063d7dcf7e05d0cee198f2 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 8a696682b3fd0cb5f32ddaca8ede5db7b001a57f)
2016-09-02Updated armbandMichael Polenchuk1-0/+0
Project: fuel 491c567c31839c0ea06b0b9e57d7bc553f92a494 [OVS-DPDK] Allocate dpdk socket memory Change-Id: Ic84094e9842295df936d9f87d0777009e0020013 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
2016-09-01Upstream: extra interfaces cfgAlexandru Avadanii2-205/+0
Change-Id: Ibd522813a40a0b1c385c47e65f77b1a13c860269 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 6be72ecc09f8465469a0a304ffbd6abc47a12915)
2016-09-01Fix: build: do not hardcode fuel branchAlexandru Avadanii1-1/+0
Change-Id: I97da6840878112a063e980c5d5d9240eb63693d7 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit cad43ce44f97f83222c6a13eaa0d8f60725b8b6f)
2016-09-01Updated armbandJonas Bjurel1-0/+0
Project: fuel 72a123c3f938fd033601b2d113dcd9f524056b8e transplant: Generate extra interfaces config file Original work by Josep, only signed by Alex for upstreaming. The DEA override may contain a IFCGF_<interface> section in its 'fuel:' section, containing the necessary keys to produce a ifcfg-<interface> file, like in this example: fuel: IFCFG_ETH1: device: eth1 ipaddress: 10.0.1.10 netmask: 255.255.255.0 gateway: 10.0.1.254 FIXME: In order for Network Manager to use the newly added interfaces for outgoing traffic and honor their GATEWAY setting (e.g. if we just added one public interface), the default route on admin iface (most of the time called eth0) should be disabled. For now, we assume the admin interface is always "eth0". Change-Id: I96e3ac5046dd59ed10c43099dd76a6418806a1f3 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 56d816920bfefe7d41d9c35cb8fb52e36295ee07)
2016-09-01Updated armbandAlexandru Avadanii1-0/+0
Project: fuel d6f49d16237333c1793d4296c43ad83892534db2 deploy/reap.py: Dump extra interfaces information. Since on AArch64, Ubuntu local mirror lacks arm64 packages (see [1]), Fuel master requires internet connectivity during deploy, and hence a way to setup such a public (extra) interface automatically. Previous commit "transplant: Generate extra interfaces config file" introduced support for passing this information via DEA (override), which may define a IFCGF_<interface> section in its 'fuel:' section, containing the necessary keys to produce a ifcfg-<interface> file, like in this example: fuel: IFCFG_ETH1: device: eth1 ipaddress: 10.0.1.10 netmask: 255.255.255.0 gateway: 10.0.1.254 In order for Network Manager to use the newly added interfaces for outgoing traffic and honor their GATEWAY setting (e.g. if we just added one public interface), the default route on admin iface (most of the time called eth0) is disabled when extra interfaces are present. FIXME: Only supports lowercase interface names, but so does Fuel, see related bug report [2]. [1] https://jira.opnfv.org/browse/ARMBAND-35 [2] https://jira.opnfv.org/browse/FUEL-136 Change-Id: I14b023b2b9b4c7d9b9f390d4f86f693c176efde0 Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 888c45b1ab7f70f226e3dc2c81725f1c6397afff)
2016-09-01Updated armbandAlexandru Avadanii1-0/+0
Project: fuel 00c404ef7066e31adfc409a15d9e0e118e0b491a build: cache: Consider UBUNTU_ARCH in .cacheid Usually UBUNTU_ARCH is not changed inside the same repository, but we should consider this case anyway for future merging Armband and Fuel@OPNFV repositories/build systems. This applies to all Fuel plugins and the local repo. Change-Id: I1fb86af4e4dc665e3b443ed8c6cfcb43f365ae6a Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 1fb86af4e4dc665e3b443ed8c6cfcb43f365ae6a)
2016-08-31Merge "Upstream: multiarch mirrors" into stable/coloradoAlexandru Avadanii2-280/+0
2016-08-31Updated armbandJonas Bjurel1-0/+0
Project: fuel e2cfdabd45281bf26a45803509f1c3555f3d93d0 repo mirror: Allow multi-arch local mirrors Original patch from Stan, signed by me for upstreaming. This patch allows specifying multiple architectures via UBUNTU_ARCH in form of a list of space separated architectures. The first architecture in the list is considered primary and will be used for building all the deb packages by fuel-main. Additional architectures are added to allow targets of other architectures to use the mirror. NOTE: this imposes a requirement that all packages built are arch independent (which is true so far). [ Alexandru Avadanii ] Reworked for applying on top of Fuel@OPNFV. Pass UBUNTU_ARCH to Docker containers. Change-Id: Ibc4ae03223545383813ac58ec34d44c1f97b4694 Signed-off-by: Stanislaw Kardach <stanislaw.kardach@cavium.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 655e777a5adeb633e114d98ffb02f74b227ab437)
2016-08-31Updated armbandJonas Bjurel1-0/+0
Project: fuel a18091f9f2a5b1ba34f38f7119eaf7f4cdfaff02 docs: build req: Remove p7zip-full p7zip-full is not required for building, as stated in the current version of the docs. I think this bogus requirement was introduced by Armband (by me, more precisely) because our build process was happening outside docker. Sorry for the useless code churn. Change-Id: Id0a3c5b9016706535ca159e1da261e83c8d36d31 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit de6d5d4b6ba6848304d620e65ad97f3aeeadccd5)
2016-08-31Merge "Upstream: delete old Fuel env if present" into stable/coloradoAlexandru Avadanii1-58/+0
2016-08-31Updated armbandJonas Bjurel1-0/+0
Project: fuel 62f4e0866d916a12066800cdaabe516d2f8388d9 Final Updates of the build instructions - Updated references Change-Id: I2a6cfdec0de6afa41ea8af59f415439b7ab7056d Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 9f00e08b54ac2be36e6315adc3bd29f7e3bd40d8)
2016-08-31Updated armbandJonas Bjurel1-0/+0
Project: fuel 6f7290b7b1147b215a1891980ae20021bde49cd7 Final updates of the Installation instructions: - Images updated - Updated reference URIs Change-Id: Ieeefbd8a3ef9bbd6c3a0e767f770097ab8a98f9d Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 087c8de9c667b28506b7621d5147be4846c06397)
2016-08-31Merge "Upstream: Fuel@OPNFV pulled patches" into stable/coloradoAlexandru Avadanii4-157/+0
2016-08-31Updated armbandJonas Bjurel1-0/+0
Project: fuel dff4ff6fa7306a2556b87a2685b1b7dce1fa7e10 deploy.sh: accept a timeout flag (-T) Original work by Josep, signed by me (Alex) for upstreaming only. Change-Id: I58a7b9bc639bb03b994ea34fc317f5679140d9fd Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com> Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit bb2a6188ff55e61390841694cac786d4e758d67b)
2016-08-31docker: build: Fix docker connectivity lossAlexandru Avadanii1-15/+11
Change-Id: Iaabd176f4032494c8ea40fd1264dafcac01b4a43 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 662822c6f09be5b23dc3f39f85ee2f21a6d3d405)
2016-08-31Merge "build: docker: Use host's network stack" into stable/coloradoAlexandru Avadanii1-0/+32
2016-08-31Upstream: multiarch mirrorsAlexandru Avadanii2-280/+0
Change-Id: Ia54bd3955a3e3b534d8c4d8380de5870a106edc5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit e799e8f3912dac025e5be5e8c748df8b68b7d06d)
2016-08-31Updated armbandMichal Skalski1-0/+0
Project: fuel 9360af2ce5d4ccef3c58dc301384db5310a04300 [ODL] Fix odl deployment on separate node JIRA: FUEL-185 Change-Id: Id14d30154b63abc915a0cd55835bb72cee862dde Signed-off-by: Michal Skalski <mskalski@mirantis.com> (cherry picked from commit ba1cb485398d811d2f473406ae085993bfd9f68a)
2016-08-31Upstream: Fuel@OPNFV pulled patchesAlexandru Avadanii4-157/+0
Change-Id: Ic584d9b1eb179009256de8ccacfb7669976823c6 (cherry picked from commit 7236ccc7f9fcb9163562d88455c80339fa6efd58)