Add changes in the recipe for the new network manager

Change-Id: I03382dbcbd350d7e3a8991633b4548658e4e4b1e
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

5 files changed, 27 insertions, 0 deletions

diff --git a/meta-phosphor/classes/obmc-phosphor-image.bbclass b/meta-phosphor/classes/obmc-phosphor-image.bbclass
index b09994bc5..384b3029a 100644
--- a/meta-phosphor/classes/obmc-phosphor-image.bbclass
+++ b/meta-phosphor/classes/obmc-phosphor-image.bbclass
@@ -51,6 +51,7 @@ FEATURE_PACKAGES_obmc-system-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-system-mgm
 FEATURE_PACKAGES_obmc-user-mgmt ?= "${@df_enabled(d, 'obmc-phosphor-user-mgmt', 'virtual-obmc-user-mgmt')}"
 FEATURE_PACKAGES_obmc-debug-collector ?= "packagegroup-obmc-apps-debug-collector"
 FEATURE_PACKAGES_obmc-settings ?= "packagegroup-obmc-apps-settings"
+FEATURE_PACKAGES_obmc-network-mgmt ?= "packagegroup-obmc-apps-network"
 
 # Install entire Phosphor application stack by default
 IMAGE_FEATURES += " \
@@ -75,6 +76,7 @@ IMAGE_FEATURES += " \
         obmc-user-mgmt \
         ssh-server-dropbear \
         obmc-debug-collector \
+        obmc-network-mgmt \
         "
 
 CORE_IMAGE_EXTRA_INSTALL_append = " bash \
diff --git a/meta-phosphor/common/recipes-phosphor/network/network.bb b/meta-phosphor/common/recipes-phosphor/network/network.bb
index 404bdaa3f..c8e49ed99 100644
--- a/meta-phosphor/common/recipes-phosphor/network/network.bb
+++ b/meta-phosphor/common/recipes-phosphor/network/network.bb
@@ -10,6 +10,8 @@ inherit obmc-phosphor-dbus-service
 inherit phosphor-networkd-rev
 
 DBUS_SERVICE_${PN} += "org.openbmc.NetworkManager.service"
+DBUS_SERVICE_${PN} += "xyz.openbmc_project.Network.service"
+
 SYSTEMD_SERVICE_${PN} += "network-update-dns.service"
 
 DEPENDS += "systemd"
diff --git a/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service b/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
new file mode 100644
index 000000000..009efc71d
--- /dev/null
+++ b/meta-phosphor/common/recipes-phosphor/network/network/xyz.openbmc_project.Network.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Phosphor Network Manager
+
+[Service]
+ExecStart={sbindir}/phosphor-network-manager
+Restart=always
+Type=dbus
+BusName={BUSNAME}
+
+[Install]
+WantedBy={SYSTEMD_DEFAULT_TARGET}
+
diff --git a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
index e49674f4c..035270e48 100644
--- a/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
+++ b/meta-phosphor/common/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bb
@@ -20,6 +20,7 @@ PACKAGES = " \
         ${PN}-host-check-mgmt \
         ${PN}-debug-collector \
         ${PN}-settings \
+        ${PN}-network \
         "
 
 SUMMARY_${PN}-bmc-state-mgmt = "BMC state management"
@@ -98,3 +99,8 @@ SUMMARY_${PN}-settings = "Settings applications"
 RDEPENDS_${PN}-settings = " \
         ${VIRTUAL-RUNTIME_obmc-settings-mgr} \
         "
+
+SUMMARY_${PN}-network = "BMC Network Manager"
+RDEPENDS_${PN}-network = " \
+        ${VIRTUAL-RUNTIME_obmc-network-manager} \
+        "
diff --git a/meta-phosphor/conf/distro/include/phosphor-defaults.inc b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
index e8462ca64..5a17df624 100644
--- a/meta-phosphor/conf/distro/include/phosphor-defaults.inc
+++ b/meta-phosphor/conf/distro/include/phosphor-defaults.inc
@@ -129,6 +129,11 @@ VIRTUAL-RUNTIME_phosphor-hwmon-config ?= \
 # Provides a manager for user settings.
 VIRTUAL-RUNTIME_obmc-settings-mgr ?= "phosphor-settings-manager"
 
+# obmc-network-manager
+#
+# Provide support for managing network
+VIRTUAL-RUNTIME_obmc-network-manager ?= "network"
+
 # virtual/phosphor-ipmi-fru-hostfw-config
 #
 # The phosphor-ipmi-fru application is data-driven and requires an input