From e51e8ff828968186e910a0a01b417550e7a6b4ab Mon Sep 17 00:00:00 2001
From: Derek Foster <justffoulkes@gmail.com>
Date: Tue, 24 Dec 2024 13:02:34 -0800
Subject: [PATCH] [ovsp4rt] Rename API files

- Renamed ovsp4rt_c_api.cc to ovsp4rt_standard_api.cc
  and ovsp4rt_cc_api.h to ovsp4rt_internal_api.h, to
  make their purpose clearer.

Signed-off-by: Derek Foster <justffoulkes@gmail.com>
---
 ovs-p4rt/sidecar/CMakeLists.txt                             | 6 +++---
 ovs-p4rt/sidecar/ovsp4rt.cc                                 | 2 +-
 .../sidecar/{ovsp4rt_cc_api.h => ovsp4rt_internal_api.h}    | 2 +-
 ovs-p4rt/sidecar/ovsp4rt_journal_api.cc                     | 4 ++--
 .../sidecar/{ovsp4rt_c_api.cc => ovsp4rt_standard_api.cc}   | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename ovs-p4rt/sidecar/{ovsp4rt_cc_api.h => ovsp4rt_internal_api.h} (98%)
 rename ovs-p4rt/sidecar/{ovsp4rt_c_api.cc => ovsp4rt_standard_api.cc} (98%)

diff --git a/ovs-p4rt/sidecar/CMakeLists.txt b/ovs-p4rt/sidecar/CMakeLists.txt
index 25ca7551..685f149c 100644
--- a/ovs-p4rt/sidecar/CMakeLists.txt
+++ b/ovs-p4rt/sidecar/CMakeLists.txt
@@ -33,13 +33,13 @@ add_library(ovs_sidecar_o OBJECT
 if(BUILD_CLIENT)
   if(BUILD_JOURNAL)
     target_sources(ovs_sidecar_o PRIVATE
-      ovsp4rt_cc_api.h
+      ovsp4rt_internal_api.h
       ovsp4rt_journal_api.cc
     )
   else()
     target_sources(ovs_sidecar_o PRIVATE
-      ovsp4rt_c_api.cc
-      ovsp4rt_cc_api.h
+      ovsp4rt_internal_api.h
+      ovsp4rt_standard_api.cc
     )
   endif()
 endif()
diff --git a/ovs-p4rt/sidecar/ovsp4rt.cc b/ovs-p4rt/sidecar/ovsp4rt.cc
index 1d8d9d9b..956f2339 100644
--- a/ovs-p4rt/sidecar/ovsp4rt.cc
+++ b/ovs-p4rt/sidecar/ovsp4rt.cc
@@ -11,7 +11,7 @@
 #include "logging/ovsp4rt_logging.h"
 #include "logging/ovsp4rt_logutils.h"
 #include "ovsp4rt/ovs-p4rt.h"
-#include "ovsp4rt_cc_api.h"
+#include "ovsp4rt_internal_api.h"
 #include "ovsp4rt_private.h"
 
 #if defined(DPDK_TARGET)
diff --git a/ovs-p4rt/sidecar/ovsp4rt_cc_api.h b/ovs-p4rt/sidecar/ovsp4rt_internal_api.h
similarity index 98%
rename from ovs-p4rt/sidecar/ovsp4rt_cc_api.h
rename to ovs-p4rt/sidecar/ovsp4rt_internal_api.h
index a1f6ddc0..cdca3a9f 100644
--- a/ovs-p4rt/sidecar/ovsp4rt_cc_api.h
+++ b/ovs-p4rt/sidecar/ovsp4rt_internal_api.h
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 // Defines the interface to the C++ functions that implement
-// the public API.
+// the ovsp4rt C API.
 
 #ifndef OVSP4RT_CC_API_H_
 #define OVSP4RT_CC_API_H_
diff --git a/ovs-p4rt/sidecar/ovsp4rt_journal_api.cc b/ovs-p4rt/sidecar/ovsp4rt_journal_api.cc
index 91506b79..e0c35160 100644
--- a/ovs-p4rt/sidecar/ovsp4rt_journal_api.cc
+++ b/ovs-p4rt/sidecar/ovsp4rt_journal_api.cc
@@ -1,11 +1,11 @@
 // Copyright 2022-2024 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-// Implements the C API using the JournalClient class.
+// Journaling implementation of the ovsp4rt C API.
 
 #include "client/ovsp4rt_journal_client.h"
 #include "ovsp4rt/ovs-p4rt.h"
-#include "ovsp4rt_cc_api.h"
+#include "ovsp4rt_internal_api.h"
 
 //----------------------------------------------------------------------
 // ovsp4rt_config_fdb_entry (DPDK, ES2K)
diff --git a/ovs-p4rt/sidecar/ovsp4rt_c_api.cc b/ovs-p4rt/sidecar/ovsp4rt_standard_api.cc
similarity index 98%
rename from ovs-p4rt/sidecar/ovsp4rt_c_api.cc
rename to ovs-p4rt/sidecar/ovsp4rt_standard_api.cc
index 3ad92d82..7319db75 100644
--- a/ovs-p4rt/sidecar/ovsp4rt_c_api.cc
+++ b/ovs-p4rt/sidecar/ovsp4rt_standard_api.cc
@@ -1,11 +1,11 @@
 // Copyright 2022-2024 Intel Corporation
 // SPDX-License-Identifier: Apache-2.0
 
-// Implementation of the C API using the Client class.
+// Standard implementation of the ovsp4rt C API.
 
 #include "client/ovsp4rt_client.h"
 #include "ovsp4rt/ovs-p4rt.h"
-#include "ovsp4rt_cc_api.h"
+#include "ovsp4rt_internal_api.h"
 
 //----------------------------------------------------------------------
 // ovsp4rt_config_fdb_entry (DPDK, ES2K)