From 36093433d67c2eb2c2a7b86ff4ffb9138e1f1869 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 25 4月 2020 22:22:00 +0800
Subject: [PATCH] improve tests
---
src/inspector/inspector.cpp | 62 +++++++++++++++++++++---------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 5608ebb..0c0819e 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -4,7 +4,7 @@
#include <licensecc/licensecc.h>
#include <fstream>
#include "../library/os/cpu_info.hpp"
-#include "../library/os/execution_environment.hpp"
+#include "../library/os/dmi_info.hpp"
using namespace std;
using namespace license::os;
@@ -24,7 +24,31 @@
{V_OTHER, "Other type of vm"}};
const unordered_map<int, string> descByVirt = {
- {VIRTUALIZATION::NONE, "No virtualization"}, {VIRTUALIZATION::VM, "VM"}, {VIRTUALIZATION::CONTAINER, "Container"}};
+ {LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::VM, "Virtual machine"},
+ {LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER, "Container"}};
+
+typedef enum {
+ PROV_UNKNOWN = 0,
+ ON_PREMISE = 1,
+ GOOGLE_CLOUD = 2,
+ AZURE_CLOUD = 3,
+ AWS = 4,
+ /**
+ * "/sys/class/dmi/id/bios_vendor" SeaBIOS
+ * "/sys/class/dmi/id/sys_vendor" Alibaba Cloud
+ * modalias
+ * "dmi:bvnSeaBIOS:bvrrel-1.7.5-0-ge51488c-20140602_164612-nilsson.home.kraxel.org:bd04/01/2014:svnAlibabaCloud:pnAlibabaCloudECS:pvrpc-i440fx-2.1:cvnAlibabaCloud:ct1:cvrpc-i440fx-2.1:"
+ */
+ ALI_CLOUD = 5
+} LCC_API_CLOUD_PROVIDER;
+
+const unordered_map<int, string> descByCloudProvider = {{PROV_UNKNOWN, "Provider unknown"},
+ {ON_PREMISE, "On premise hardware (no cloud)"},
+ {GOOGLE_CLOUD, "Google Cloud"},
+ {AZURE_CLOUD, "Microsoft Azure"},
+ {AWS, "Amazon AWS"},
+ {ALI_CLOUD, "Alibaba Cloud (Chinese cloud provider)"}};
const unordered_map<int, string> stringByEventType = {
{LICENSE_OK, "OK "},
@@ -53,31 +77,31 @@
}
int main(int argc, char* argv[]) {
- license::os::CpuInfo cpu;
- cout << "Cpu Vendor :" << cpu.vendor() << endl;
- cout << "Cpu Brand :" << cpu.brand() << endl;
- cout << "Cpu is hypervis.:" << cpu.cpu_virtual() << endl;
- cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
- cout << "Virt. detail cpu:" << descByVirtDetail.find(cpu.virtualization_details())->second << endl <<endl;
- ExecutionEnvironment execEnv;
- cout << "Running in cloud:" << execEnv.is_cloud() << endl;
- cout << "Docker :" << execEnv.is_docker() << endl;
- cout << "other container :" << execEnv.is_container() << endl;
- cout << "Virtualiz. class:" << descByVirt.find(execEnv.getVirtualization())->second << endl;
-
- cout << "Bios vendor :" << execEnv.bios_vendor() << endl;
- cout << "Bios description:" << execEnv.bios_description() << endl;
- cout << "System vendor :" << execEnv.sys_vendor() << endl <<endl;
-
char hw_identifier[LCC_API_PC_IDENTIFIER_SIZE + 1];
size_t bufSize = LCC_API_PC_IDENTIFIER_SIZE + 1;
+ ExecutionEnvironmentInfo exec_env_info;
for (const auto& x : stringByStrategyId) {
- if (identify_pc(static_cast<LCC_API_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize)) {
+ if (identify_pc(static_cast<LCC_API_HW_IDENTIFICATION_STRATEGY>(x.first), hw_identifier, &bufSize,
+ &exec_env_info)) {
std::cout << x.second << ':' << hw_identifier << std::endl;
} else {
std::cout << x.second << ": NA" << endl;
}
}
+ cout << "Virtualiz. class :" << descByVirt.find(exec_env_info.virtualization)->second << endl;
+ cout << "Virtualiz. detail:" << descByVirtDetail.find(exec_env_info.virtualization_detail)->second << endl;
+ cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider) << endl
+ << "=============" << endl;
+ license::os::CpuInfo cpu;
+ cout << "Cpu Vendor :" << cpu.vendor() << endl;
+ cout << "Cpu Brand :" << cpu.brand() << endl;
+ cout << "Cpu hypervisor :" << cpu.is_hypervisor_set() << endl;
+ cout << "Cpu model :0x" << std::hex << ((long)cpu.model()) << std::dec << endl;
+ license::os::DmiInfo dmi_info;
+ cout << "Bios vendor :" << dmi_info.bios_vendor() << endl;
+ cout << "Bios description:" << dmi_info.bios_description() << endl;
+ cout << "System vendor :" << dmi_info.sys_vendor() << endl << endl;
+
if (argc == 2) {
const string fname(argv[1]);
--
Gitblit v1.9.1