Rename proto file

uweseimet · Nov 24, 2023 · 457aa9d · 457aa9d
1 parent 668cc96
commit 457aa9d
Show file tree

Hide file tree

Showing 36 changed files with 58 additions and 58 deletions.
diff --git a/cpp/Makefile b/cpp/Makefile
@@ -70,9 +70,9 @@ ifeq ($(CONNECT_TYPE), FULLSPEC)
 	BIN_ALL += $(BINDIR)/$(SCSIEXEC)
 endif
 
-SRC_PROTOC = piscsi_interface.proto
+SRC_PROTOC = scsi2pi_interface.proto
 
-SRC_GENERATED = $(GENERATED_DIR)/piscsi_interface.pb.cpp
+SRC_GENERATED = $(GENERATED_DIR)/scsi2pi_interface.pb.cpp
 
 SRC_PROTOBUF = \
 	shared/protobuf_util.cpp
@@ -158,7 +158,7 @@ $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
 $(SRC_GENERATED) : $(SRC_PROTOC)
 	mkdir -p $(GENERATED_DIR)
 	protoc --cpp_out=$(GENERATED_DIR) $(SRC_PROTOC)
-	mv $(GENERATED_DIR)/piscsi_interface.pb.cc $@
+	mv $(GENERATED_DIR)/scsi2pi_interface.pb.cc $@
 
 $(OBJ_GENERATED) : $(SRC_GENERATED) | $(OBJDIR)
 	$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -187,7 +187,7 @@ coverage: test
 
 lcov: CXXFLAGS += --coverage
 lcov: test
-	lcov -q -c -d . --include '*/cpp/*' -o $(COVERAGE_FILE) --exclude '*/test/*' --exclude '*/interfaces/*' --exclude '*/piscsi_interface.pb*'
+	lcov -q -c -d . --include '*/cpp/*' -o $(COVERAGE_FILE) --exclude '*/test/*' --exclude '*/interfaces/*' --exclude '*/scsi2pi_interface.pb*'
 	genhtml -q -o $(COVERAGE_DIR) --legend $(COVERAGE_FILE)
 
 docs: $(DOC_DIR)/piscsi_man_page.txt $(DOC_DIR)/scsictl_man_page.txt $(DOC_DIR)/scsidump_man_page.txt

diff --git a/cpp/devices/device.h b/cpp/devices/device.h
@@ -9,13 +9,13 @@
 
 #pragma once
 
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "shared/piscsi_util.h"
 #include <unordered_map>
 #include <string>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 // A combination of device ID and LUN
 using id_set = pair<int, int>;

diff --git a/cpp/devices/device_factory.h b/cpp/devices/device_factory.h
@@ -13,11 +13,11 @@
 
 #include <string>
 #include <unordered_map>
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "shared/piscsi_util.h"
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class PrimaryDevice;
 

diff --git a/cpp/devices/disk_cache.h b/cpp/devices/disk_cache.h
@@ -15,14 +15,14 @@
 
 #pragma once
 
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include <span>
 #include <array>
 #include <memory>
 #include <string>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class DiskCache
 {

diff --git a/cpp/devices/host_services.cpp b/cpp/devices/host_services.cpp
@@ -75,7 +75,7 @@
 // | 9   |                           Control                                     |
 // +==============================================================================
 //
-// The piscsi commands that can be executed are defined in the piscsi_interface.proto file.
+// The piscsi commands that can be executed are defined in the scsi2pi_interface.proto file.
 // The BIN, JSON and TEXT flags control the input and output format of the protobuf data.
 // Exactly one of them must be set. Input and output format do not have to be identical.
 // ReceiveOperationResults returns the result of the last operation executed.
@@ -86,7 +86,7 @@
 #include "controllers/scsi_controller.h"
 #include "scsi_command_util.h"
 #include "host_services.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include <google/protobuf/util/json_util.h>
 #include <google/protobuf/text_format.h>
 #include <algorithm>
@@ -95,7 +95,7 @@
 using namespace std::chrono;
 using namespace google::protobuf;
 using namespace google::protobuf::util;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace scsi_defs;
 using namespace scsi_command_util;
 using namespace protobuf_util;

diff --git a/cpp/devices/host_services.h b/cpp/devices/host_services.h
@@ -21,7 +21,7 @@
 #include <map>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class HostServices: public ModePageDevice
 {

diff --git a/cpp/piscsi/command_context.cpp b/cpp/piscsi/command_context.cpp
@@ -14,7 +14,7 @@
 #include <iostream>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace protobuf_util;
 
 bool CommandContext::ReadCommand()

diff --git a/cpp/piscsi/command_context.h b/cpp/piscsi/command_context.h
@@ -10,11 +10,11 @@
 #pragma once
 
 #include "localizer.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include <string>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class CommandContext
 {

diff --git a/cpp/piscsi/command_dispatcher.cpp b/cpp/piscsi/command_dispatcher.cpp
@@ -15,7 +15,7 @@
 
 using namespace std;
 using namespace spdlog;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace piscsi_util;
 using namespace protobuf_util;
 

diff --git a/cpp/piscsi/command_dispatcher.h b/cpp/piscsi/command_dispatcher.h
@@ -13,7 +13,7 @@
 #include "piscsi/piscsi_executor.h"
 #include "piscsi/piscsi_image.h"
 #include "piscsi/piscsi_response.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 
 using namespace std;
 

diff --git a/cpp/piscsi/piscsi_core.cpp b/cpp/piscsi/piscsi_core.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 using namespace filesystem;
 using namespace spdlog;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace piscsi_util;
 using namespace protobuf_util;
 using namespace scsi_defs;

diff --git a/cpp/piscsi/piscsi_core.h b/cpp/piscsi/piscsi_core.h
@@ -16,7 +16,7 @@
 #include "piscsi/piscsi_image.h"
 #include "piscsi/piscsi_response.h"
 #include "piscsi/piscsi_executor.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "spdlog/sinks/stdout_color_sinks.h"
 #include <span>
 #include <string>

diff --git a/cpp/piscsi/piscsi_image.cpp b/cpp/piscsi/piscsi_image.cpp
@@ -18,7 +18,7 @@
 
 using namespace std;
 using namespace filesystem;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace protobuf_util;
 
 PiscsiImage::PiscsiImage()

diff --git a/cpp/piscsi/piscsi_image.h b/cpp/piscsi/piscsi_image.h
@@ -9,14 +9,14 @@
 
 #pragma once
 
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "command_context.h"
 #include <string>
 #include <filesystem>
 
 using namespace std;
 using namespace filesystem;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class PiscsiImage
 {

diff --git a/cpp/piscsi/piscsi_response.cpp b/cpp/piscsi/piscsi_response.cpp
@@ -19,7 +19,7 @@
 
 using namespace std;
 using namespace filesystem;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace piscsi_util;
 using namespace network_util;
 using namespace protobuf_util;

diff --git a/cpp/piscsi/piscsi_response.h b/cpp/piscsi/piscsi_response.h
@@ -12,14 +12,14 @@
 #include "devices/device_factory.h"
 #include "devices/primary_device.h"
 #include "shared/piscsi_util.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include <string>
 #include <span>
 #include <set>
 
 using namespace std;
 using namespace filesystem;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class PiscsiResponse
 {

diff --git a/cpp/piscsi_interface.proto → cpp/scsi2pi_interface.proto b/cpp/piscsi_interface.proto → cpp/scsi2pi_interface.proto
@@ -18,7 +18,7 @@
 
 syntax = "proto3";
 
-package piscsi_interface;
+package scsi2pi_interface;
 
 // The available device types
 enum PbDeviceType {

diff --git a/cpp/scsictl/scsictl_commands.cpp b/cpp/scsictl/scsictl_commands.cpp
@@ -26,7 +26,7 @@
 using namespace std;
 using namespace google::protobuf;
 using namespace google::protobuf::util;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace network_util;
 using namespace piscsi_util;
 using namespace protobuf_util;

diff --git a/cpp/scsictl/scsictl_commands.h b/cpp/scsictl/scsictl_commands.h
@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "scsictl_display.h"
 #include <string>
 
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 struct sockaddr_in;
 

diff --git a/cpp/scsictl/scsictl_core.cpp b/cpp/scsictl/scsictl_core.cpp
@@ -25,7 +25,7 @@
 #include <fstream>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace piscsi_util;
 using namespace protobuf_util;
 

diff --git a/cpp/scsictl/scsictl_display.cpp b/cpp/scsictl/scsictl_display.cpp
@@ -17,7 +17,7 @@
 #include <iomanip>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace piscsi_util;
 using namespace protobuf_util;
 

diff --git a/cpp/scsictl/scsictl_display.h b/cpp/scsictl/scsictl_display.h
@@ -9,11 +9,11 @@
 
 #pragma once
 
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include <string>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class ScsictlDisplay
 {

diff --git a/cpp/scsictl/scsictl_parser.h b/cpp/scsictl/scsictl_parser.h
@@ -9,10 +9,10 @@
 
 #include <string>
 #include <unordered_map>
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class ScsictlParser
 {

diff --git a/cpp/scsiexec/scsiexec_phase_executor.h b/cpp/scsiexec/scsiexec_phase_executor.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include "hal/bus.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include <ctime>
 #include <stdexcept>
 #include <span>

diff --git a/cpp/scsiexec/scsiexec_scsi_executor.cpp b/cpp/scsiexec/scsiexec_scsi_executor.cpp
@@ -20,7 +20,7 @@ using namespace filesystem;
 using namespace google::protobuf;
 using namespace google::protobuf::util;
 using namespace scsi_defs;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 string ScsiExecutor::Execute(const string& filename, protobuf_format input_format, PbResult& result)
 {

diff --git a/cpp/scsiexec/scsiexec_scsi_executor.h b/cpp/scsiexec/scsiexec_scsi_executor.h
@@ -15,7 +15,7 @@
 #include <string>
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 class ScsiExecutor
 {

diff --git a/cpp/shared/protobuf_util.cpp b/cpp/shared/protobuf_util.cpp
@@ -18,7 +18,7 @@
 
 using namespace std;
 using namespace piscsi_util;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 #define FPRT(fp, ...) fprintf(fp, __VA_ARGS__ )
 

diff --git a/cpp/shared/protobuf_util.h b/cpp/shared/protobuf_util.h
@@ -14,10 +14,10 @@
 #include <string>
 #include <span>
 #include <vector>
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 
 using namespace std;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 
 namespace protobuf_util
 {

diff --git a/cpp/test/mocks.h b/cpp/test/mocks.h
@@ -93,7 +93,7 @@ class MockAbstractController : public AbstractController //NOSONAR Having many f
 {
 	friend class TestInquiry;
 
-	friend shared_ptr<PrimaryDevice> CreateDevice(piscsi_interface::PbDeviceType, AbstractController&, int);
+	friend shared_ptr<PrimaryDevice> CreateDevice(scsi2pi_interface::PbDeviceType, AbstractController&, int);
 
 	FRIEND_TEST(AbstractControllerTest, AllocateCmd);
 	FRIEND_TEST(AbstractControllerTest, Reset);

diff --git a/cpp/test/piscsi_executor_test.cpp b/cpp/test/piscsi_executor_test.cpp
@@ -12,14 +12,14 @@
 #include "shared/piscsi_exceptions.h"
 #include "controllers/controller_manager.h"
 #include "devices/device_factory.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "piscsi/command_context.h"
 #include "piscsi/piscsi_response.h"
 #include "piscsi/piscsi_executor.h"
 #include <filesystem>
 
 using namespace filesystem;
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace protobuf_util;
 
 TEST(PiscsiExecutorTest, ProcessDeviceCmd)

diff --git a/cpp/test/piscsi_image_test.cpp b/cpp/test/piscsi_image_test.cpp
@@ -9,10 +9,10 @@
 
 #include "mocks.h"
 #include "shared/protobuf_util.h"
-#include "generated/piscsi_interface.pb.h"
+#include "generated/scsi2pi_interface.pb.h"
 #include "piscsi/piscsi_image.h"
 
-using namespace piscsi_interface;
+using namespace scsi2pi_interface;
 using namespace protobuf_util;
 
 TEST(PiscsiImageTest, SetGetDepth)