diff options
author | Manojkiran Eda <manojkiran.eda@gmail.com> | 2020-05-11 14:30:00 +0300 |
---|---|---|
committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-18 21:44:30 +0300 |
commit | df57e3a63ccc7adcf2d8aabe6586295e97a954d9 (patch) | |
tree | e09898da1b122e6a7c2a514d6e63f2175969206e /meta-ibm | |
parent | 369e79374a82da93844928a3ab2d7f10008fda9d (diff) | |
download | openbmc-df57e3a63ccc7adcf2d8aabe6586295e97a954d9.tar.xz |
Enable JSON to Map Inventory Object with Network Interface
- This commit would enable a configuration JSON file, through which
one can map the inventory object paths to the actual ethernet
interfaces which are managed Network Service.
For Example:
- Lets say the Inventory path for a single ethernet Interface machine
would look something like below:
`/xyz/openbmc_project/inventory/system/chassis/motherboard/boxelder/bmc/ethernet`
Then the corresponding configuration JSON would looks something like below:
{
"eth0":"ethernet"
}
Note that the key (eth0) in the JSON is the actual ethernet Interface
managed by the Network Service, and the value (ethernet) is the search
pattern to be found in the Inventory Path String.
- The above JSON would help the phosphor-network service to look for a
match on the Interface Added signal under Inventory Path with an object
path that contains the pattern String ("ethernet"), and there it gets the
MAC address populated under the respective inventory path and set it as
the MAC address of the eth0 Interface.
(From meta-ibm rev: 0e69c800da414c88d24e4fa5fe8d9bf560b87637)
Signed-off-by: Manojkiran Eda <manojkiran.eda@gmail.com>
Change-Id: I9e0ab9d8368efae226334086f7b1c5b6fa821770
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'meta-ibm')
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service (renamed from meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service) | 0 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json | 4 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json | 3 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service | 12 | ||||
-rw-r--r-- | meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend | 31 |
9 files changed, 73 insertions, 7 deletions
diff --git a/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json new file mode 100644 index 0000000000..52280a4e67 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service index 890551e7a4..890551e7a4 100644 --- a/meta-ibm/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/recipes-phosphor/network/network/ibm-ac-server/ncsi-netlink.service diff --git a/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json new file mode 100644 index 0000000000..52280a4e67 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/mihawk/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"ethernet" +} diff --git a/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service new file mode 100644 index 0000000000..890551e7a4 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/mihawk/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json new file mode 100644 index 0000000000..08bb92aeda --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/rainier/inventory-object-map.json @@ -0,0 +1,4 @@ +{ + "eth0":"ethernet0", + "eth1":"ethernet1" +} diff --git a/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service new file mode 100644 index 0000000000..890551e7a4 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/rainier/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json new file mode 100644 index 0000000000..9f535ca8fb --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/inventory-object-map.json @@ -0,0 +1,3 @@ +{ + "eth0":"eth0" +} diff --git a/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service new file mode 100644 index 0000000000..890551e7a4 --- /dev/null +++ b/meta-ibm/recipes-phosphor/network/network/witherspoon-tacoma/ncsi-netlink.service @@ -0,0 +1,12 @@ +[Unit] +Description=Stop the ethernet link failover +After=network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend index bcb2d0136d..178a921a07 100644 --- a/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,15 +1,32 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/network:" -SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service" -SRC_URI_append_mihawk = " file://ncsi-netlink.service" -SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service" -SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service" +SRC_URI += " file://ncsi-netlink.service" +SYSTEMD_SERVICE_${PN} += " ncsi-netlink.service" +FILES_${PN} += "${datadir}/network/*.json" -do_install_append_ibm-ac-server() { +install_network_configuration(){ install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} + install -d ${D}${datadir}/network/ + install -m 0644 ${WORKDIR}/inventory-object-map.json ${D}${datadir}/network/config.json +} + +SRC_URI_append_rainier = " file://inventory-object-map.json" +do_install_append_rainier(){ + install_network_configuration +} + +SRC_URI_append_ibm-ac-server = " file://inventory-object-map.json" +do_install_append_ibm-ac-server() { + install_network_configuration } + +SRC_URI_append_mihawk = " file://inventory-object-map.json" do_install_append_mihawk() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} + install_network_configuration +} + +SRC_URI_append_witherspoon-tacoma = " file://inventory-object-map.json" +do_install_append_witherspoon-tacoma(){ + install_network_configuration } |