Conversation
* It is not used and exposed D-Bus values directly.
* Adopt get_property wherever is possible.
jcronenberg
reviewed
Nov 5, 2024
Contributor
jcronenberg
left a comment
There was a problem hiding this comment.
I mostly looked at the NM dbus code, because that's what I know, but it looks like a nice improvement all around 🙂
jreidinger
reviewed
Nov 5, 2024
jreidinger
reviewed
Nov 5, 2024
jreidinger
reviewed
Nov 5, 2024
| Ok(self.calculator_proxy.calculate(settings.into()).await?) | ||
| let map: HashMap<&str, zbus::zvariant::Value> = settings.into(); | ||
| let options: HashMap<&str, &zbus::zvariant::Value> = | ||
| map.iter().map(|(id, value)| (*id, value)).collect(); |
Contributor
There was a problem hiding this comment.
I have feeling that this be written better, but sadly do not have idea how....so lets keep it so far
jreidinger
reviewed
Nov 5, 2024
jreidinger
reviewed
Nov 5, 2024
jreidinger
reviewed
Nov 5, 2024
jreidinger
reviewed
Nov 6, 2024
jreidinger
reviewed
Nov 6, 2024
mvidner
reviewed
Nov 6, 2024
|
|
||
| let ipv4_section = HashMap::from([ | ||
| ("method".to_string(), Value::new("auto").to_owned()), | ||
| ("method".to_string(), Value::new("auto").try_to_owned()?), |
Contributor
There was a problem hiding this comment.
@imobachgs I know this is just test code, but it bothered me how the meaningful text was lost among the boilerplate, so I made a helper for readability:
diff --git a/rust/agama-server/src/network/nm/dbus.rs b/rust/agama-server/src/network/nm/dbus.rs
index 3e4ab1bf6..99e69ad2e 100644
--- a/rust/agama-server/src/network/nm/dbus.rs
+++ b/rust/agama-server/src/network/nm/dbus.rs
@@ -1195,6 +1195,14 @@ mod test {
use uuid::Uuid;
use zbus::zvariant::{self, Array, Dict, OwnedValue, Value};
+ // hash item
+ fn hi<'a, T>(key: &str, value: T) -> anyhow::Result<(String, OwnedValue)>
+ where
+ T: Into<Value<'a>> + zbus::zvariant::Type,
+ {
+ Ok((key.to_string(), Value::new(value).try_to_owned()?))
+ }
+
#[test]
fn test_connection_from_dbus() -> anyhow::Result<()> {
let uuid = Uuid::new_v4().to_string();
@@ -1216,31 +1231,13 @@ mod test {
])];
let ipv4_section = HashMap::from([
- ("method".to_string(), Value::new("auto").try_to_owned()?),
- (
- "address-data".to_string(),
- Value::new(address_v4_data).try_to_owned()?,
- ),
- (
- "gateway".to_string(),
- Value::new("192.168.0.1").try_to_owned()?,
- ),
- (
- "dns-data".to_string(),
- Value::new(vec!["192.168.0.2"]).try_to_owned()?,
- ),
- (
- "dns-search".to_string(),
- Value::new(vec!["suse.com", "example.com"]).try_to_owned()?,
- ),
- (
- "ignore-auto-dns".to_string(),
- Value::new(true).try_to_owned()?,
- ),
- (
- "route-data".to_string(),
- Value::new(route_v4_data).try_to_owned()?,
- ),
+ hi("method", "auto")?,
+ hi("address-data", address_v4_data)?,
+ hi("gateway", "192.168.0.1")?,
+ hi("dns-data", vec!["192.168.0.2"])?,
+ hi("dns-search", vec!["suse.com", "example.com"])?,
+ hi("ignore-auto-dns", true)?,
+ hi("route-data", route_v4_data)?,
]);
let address_v6_data = vec![HashMap::from([
mvidner
added a commit
that referenced
this pull request
Nov 7, 2024
## Problem As I was reviewing #1716 I noticed it was touching some repetitive code to set up test data ## Solution Don't bury the actual test data among so much boilerplate. Diff: +85 -236 ## Testing `cargo test` continues to work ✔️ ## Screenshots N/A
Merged
imobachgs
added a commit
that referenced
this pull request
Jan 13, 2025
Update to release version 11. * #1495 * #1564 * #1617 * #1618 * #1625 * #1626 * #1627 * #1628 * #1630 * #1631 * #1632 * #1633 * #1634 * #1635 * #1636 * #1639 * #1640 * #1641 * #1642 * #1643 * #1644 * #1645 * #1646 * #1647 * #1648 * #1649 * #1650 * #1651 * #1652 * #1654 * #1655 * #1656 * #1657 * #1660 * #1663 * #1666 * #1667 * #1668 * #1670 * #1671 * #1673 * #1674 * #1675 * #1676 * #1677 * #1681 * #1682 * #1683 * #1684 * #1687 * #1688 * #1689 * #1690 * #1691 * #1692 * #1693 * #1694 * #1695 * #1696 * #1698 * #1699 * #1702 * #1703 * #1704 * #1705 * #1707 * #1708 * #1709 * #1710 * #1711 * #1712 * #1713 * #1714 * #1715 * #1716 * #1717 * #1718 * #1720 * #1721 * #1722 * #1723 * #1727 * #1728 * #1729 * #1731 * #1732 * #1733 * #1734 * #1735 * #1736 * #1737 * #1740 * #1741 * #1743 * #1744 * #1745 * #1746 * #1751 * #1753 * #1754 * #1755 * #1757 * #1762 * #1763 * #1764 * #1765 * #1766 * #1767 * #1769 * #1771 * #1772 * #1773 * #1774 * #1777 * #1778 * #1785 * #1786 * #1787 * #1788 * #1789 * #1790 * #1791 * #1792 * #1793 * #1794 * #1795 * #1796 * #1797 * #1798 * #1799 * #1800 * #1802 * #1803 * #1804 * #1805 * #1807 * #1808 * #1809 * #1810 * #1811 * #1812 * #1814 * #1815 * #1821 * #1822 * #1823 * #1824 * #1825 * #1826 * #1827 * #1828 * #1830 * #1831 * #1832 * #1833 * #1834 * #1835 * #1836 * #1837 * #1838 * #1839 * #1840 * #1841 * #1842 * #1843 * #1844 * #1845 * #1847 * #1848 * #1849 * #1850 * #1851 * #1854 * #1855 * #1856 * #1857 * #1860 * #1861 * #1863 * #1864 * #1865 * #1866 * #1867 * #1871 * #1872 * #1873 * #1875 * #1876 * #1877 * #1878 * #1880 * #1881 * #1882 * #1883 * #1884 * #1885 * #1886 * #1888 * #1889 * #1890
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The main goal
Although zbus 5 5 was released a few days ago, Agama is still using zbus 3. The goal of this PR is to adapt the code to use the latest version.
However, this task is not trivial: version 4 already introduced a good share of breaking changes in zbus API.
downcast_refreturnsResultThe
downcast_reffunction now returns aResultinstead of anOptionwith, IMHO, it is the right thing to do. This change has a big impact in our code to interact with NetworkManager, so I took the opportunity to:Nonewhen something went wrong).get_propertyandget_optional_propertyto simplify our code a bit.Other changes
network::nm::dbusmodule. Let's useget_propertyandget_optional_propertyfor better readability and error handling. Please, check this commit (WIP) if you are interested in further improvements.Tasks
network::nm::dbusmodule.