Fix usages of policy in code

2 files changed, 17 insertions, 9 deletions

diff --git a/tools/policy_table_validator/CMakeLists.txt b/tools/policy_table_validator/CMakeLists.txt
index 7d9194e473..7628a13b93 100644
--- a/tools/policy_table_validator/CMakeLists.txt
+++ b/tools/policy_table_validator/CMakeLists.txt
@@ -1,12 +1,17 @@
 #set( CMAKE_VERBOSE_MAKEFILE on )
 
 include_directories(
-  ${CMAKE_SOURCE_DIR}/src/components/policy/include
   ${CMAKE_SOURCE_DIR}/src/components/rpc_base/include/
   ${CMAKE_SOURCE_DIR}/src/components/utils/include/
 	${JSONCPP_INCLUDE_DIRECTORY}
 )
 
+  message(STATUS "use ${EXTENDED_POLICY} poicy")
+if (${EXTENDED_POLICY} STREQUAL "EXTENDED_PROPRIETARY")
+  include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_premium/include/)
+else()
+  include_directories(${CMAKE_SOURCE_DIR}/src/components/policy/policy_regular/include/)
+endif()
 
 link_directories (
   ${CMAKE_BINARY_DIR}/src/components/rpc_base/
diff --git a/tools/policy_table_validator/main.cpp b/tools/policy_table_validator/main.cpp
index 509182edbf..99a4b7d7f9 100644
--- a/tools/policy_table_validator/main.cpp
+++ b/tools/policy_table_validator/main.cpp
@@ -15,7 +15,8 @@ enum ResultCode {
   PT_TYPE_ERROR
 };
 
-rpc::policy_table_interface_base::PolicyTableType StringToPolicyTableType(const std::string& str_pt_type) {
+rpc::policy_table_interface_base::PolicyTableType StringToPolicyTableType(
+    const std::string& str_pt_type) {
   if (str_pt_type == "PT_PRELOADED") {
     return rpc::policy_table_interface_base::PT_PRELOADED;
   }
@@ -29,10 +30,11 @@ rpc::policy_table_interface_base::PolicyTableType StringToPolicyTableType(const
 }
 
 void help() {
-  std::cout << "Usage:" << std::endl <<
-               "./policy_validator {Policy table type} {file_name}" << std::endl;
+  std::cout << "Usage:" << std::endl
+            << "./policy_validator {Policy table type} {file_name}"
+            << std::endl;
   std::cout << "Policy table types:"
-               "\t PT_PRELOADED , PT_UPDATE , PT_SNAPSHOT" <<std::endl;
+               "\t PT_PRELOADED , PT_UPDATE , PT_SNAPSHOT" << std::endl;
 }
 
 int main(int argc, char** argv) {
@@ -46,8 +48,8 @@ int main(int argc, char** argv) {
   std::string json_string;
   rpc::policy_table_interface_base::PolicyTableType pt_type;
   pt_type = StringToPolicyTableType(pt_type_str);
-  if (rpc::policy_table_interface_base::PolicyTableType::INVALID_PT_TYPE
-      == pt_type) {
+  if (rpc::policy_table_interface_base::PolicyTableType::INVALID_PT_TYPE ==
+      pt_type) {
     std::cout << "Invalid policy table type: " << pt_type_str << std::endl;
     exit(PT_TYPE_ERROR);
   }
@@ -69,7 +71,7 @@ int main(int argc, char** argv) {
   policy_table::Table table(&value);
   table.SetPolicyTableType(pt_type);
   bool is_valid = table.is_valid();
-  if (true == is_valid ) {
+  if (true == is_valid) {
     std::cout << "Table is valid" << std::endl;
     exit(SUCCES);
   }
@@ -77,7 +79,8 @@ int main(int argc, char** argv) {
   std::cout << "Table is not valid" << std::endl;
   rpc::ValidationReport report("policy_table");
   table.ReportErrors(&report);
-  std::cout << "Errors: " << std::endl << rpc::PrettyFormat(report) << std::endl;
+  std::cout << "Errors: " << std::endl
+            << rpc::PrettyFormat(report) << std::endl;
 
   return SUCCES;
 }