Code refactoring
Moved all the constants to const.hpp and utility method to
utils.cpp/hpp.
Removed file ibm_vpd_type_check.cpp/hpp and keyword_vpd_types.hpp.
Signed-off-by: SunnySrivastava1984 <sunnsr25@in.ibm.com>
Change-Id: Ie7b54e6fd03a499fab7c3124e17292c6d525e471
diff --git a/keyword_vpd_parser.hpp b/keyword_vpd_parser.hpp
index 769a83a..f2339fa 100644
--- a/keyword_vpd_parser.hpp
+++ b/keyword_vpd_parser.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include "keyword_vpd_types.hpp"
+#include "types.hpp"
namespace vpd
{
@@ -31,7 +31,6 @@
* 6) Validate the 'small resource type last end tag'.
* 7) Return the keyword-value map.
*/
-
class KeywordVpdParser
{
public:
@@ -45,7 +44,7 @@
*
* Move kwVpdVector to parser object's kwVpdVector
*/
- KeywordVpdParser(Binary&& kwVpdVector) :
+ KeywordVpdParser(openpower::vpd::Binary&& kwVpdVector) :
keywordVpdVector(std::move(kwVpdVector))
{
}
@@ -59,15 +58,19 @@
*
* @return map of keyword:value
*/
- KeywordVpdMap parseKwVpd();
+ openpower::vpd::inventory::KeywordVpdMap parseKwVpd();
private:
- Binary::iterator checkSumStart; //!< Pointer to the start byte from where
- //!< the checksum need to be calculated
- Binary::iterator checkSumEnd; //!< Pointer to the end byte until which the
- //!< checksum need to be calculated
- Binary::iterator kwVpdIterator; //!< Iterator to parse the vector
- Binary keywordVpdVector; //!< Vector which stores keyword VPD data
+ openpower::vpd::Binary::iterator
+ checkSumStart; //!< Pointer to the start byte from where
+ //!< the checksum need to be calculated
+ openpower::vpd::Binary::iterator
+ checkSumEnd; //!< Pointer to the end byte until which the
+ //!< checksum need to be calculated
+ openpower::vpd::Binary::iterator
+ kwVpdIterator; //!< Iterator to parse the vector
+ openpower::vpd::Binary
+ keywordVpdVector; //!< Vector which stores keyword VPD data
/**
* @brief Validate the large resource identifier string
@@ -86,7 +89,7 @@
*
* @return map of keyword:value
*/
- KeywordVpdMap kwValParser();
+ openpower::vpd::inventory::KeywordVpdMap kwValParser();
/**
* @brief Validate small resource type end tag