From f1b4cbc52036bb4681c0669102dc8ac6c8a36bdf Mon Sep 17 00:00:00 2001
From: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: Tue, 15 Dec 2020 21:59:46 +0100
Subject: [PATCH] bulkdata: Align with latest bbf changes

---
 bulkdata/src/common.c | 2 +-
 bulkdata/src/config.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/bulkdata/src/common.c b/bulkdata/src/common.c
index 7ceaf6f72..252fa7553 100644
--- a/bulkdata/src/common.c
+++ b/bulkdata/src/common.c
@@ -17,7 +17,7 @@ static pathnode *temphead = NULL;
 int bulkdata_dm_ctx_init(struct dmctx *ctx)
 {
 	struct bulkdata *bulkdata = &bulkdata_main;
-	dm_ctx_init(ctx, DM_CWMP, bulkdata->amd_version, bulkdata->instance_mode);
+	dm_ctx_init(ctx, bulkdata->instance_mode);
 	return 0;
 }
 
diff --git a/bulkdata/src/config.c b/bulkdata/src/config.c
index 175545ba5..ad73ff193 100644
--- a/bulkdata/src/config.c
+++ b/bulkdata/src/config.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <libbbfdm/deviceinfo.h>
 
 #include "log.h"
 #include "config.h"
@@ -77,9 +76,9 @@ int get_device_id_config(struct bulkdata *bulkdata)
 	struct dmctx dmctx = {0};
 
 	bulkdata_dm_ctx_init(&dmctx);
-	bulkdata->device_id.manufacturer_oui = strdup(get_deviceid_manufactureroui());
-	bulkdata->device_id.product_class = strdup(get_deviceid_productclass());
-	bulkdata->device_id.serial_number = strdup(get_deviceid_serialnumber());
+	bulkdata->device_id.manufacturer_oui = bulkdata_get_value_param("Device.DeviceInfo.ManufacturerOUI");
+	bulkdata->device_id.product_class = bulkdata_get_value_param("Device.DeviceInfo.ProductClass");
+	bulkdata->device_id.serial_number = bulkdata_get_value_param("Device.DeviceInfo.SerialNumber");
 	bulkdata_dm_ctx_clean(&dmctx);
 
 	return 0;