From 7e4e14dde5fbfade46311fbf75386d5371062d7d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 24 10月 2020 19:59:33 +0800
Subject: [PATCH] review of disk strategy linux
---
src/inspector/inspector.cpp | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/inspector/inspector.cpp b/src/inspector/inspector.cpp
index 1c4d0af..640071d 100644
--- a/src/inspector/inspector.cpp
+++ b/src/inspector/inspector.cpp
@@ -10,15 +10,13 @@
#include "../library/os/dmi_info.hpp"
#include "../library/os/cpu_info.hpp"
#include "../library/os/dmi_info.hpp"
+#include "../library/os/network.hpp"
using namespace std;
using namespace license::os;
-const map<int, string> stringByStrategyId = {{STRATEGY_DEFAULT, "DEFAULT"},
- {STRATEGY_ETHERNET, "MAC"},
- {STRATEGY_IP_ADDRESS, "IP"},
- {STRATEGY_DISK_NUM, "Disk1"},
- {STRATEGY_DISK_LABEL, "Disk2"}};
+const map<int, string> stringByStrategyId = {
+ {STRATEGY_DEFAULT, "DEFAULT"}, {STRATEGY_ETHERNET, "MAC"}, {STRATEGY_IP_ADDRESS, "IP"}, {STRATEGY_DISK, "Disk"}};
const unordered_map<int, string> descByVirtDetail = {{BARE_TO_METAL, "No virtualization"},
{VMWARE, "Vmware"},
@@ -26,6 +24,7 @@
{V_XEN, "XEN"},
{KVM, "KVM"},
{HV, "Microsoft Hypervisor"},
+ {PARALLELS, "Parallels Desktop"},
{V_OTHER, "Other type of vm"}};
const unordered_map<int, string> descByVirt = {{LCC_API_VIRTUALIZATION_SUMMARY::NONE, "No virtualization"},
@@ -69,7 +68,7 @@
for (CSimpleIniA::Entry section : sections) {
const string section_name(section.pItem, 15);
if (section_name != LCC_PROJECT_NAME) {
- std::copy(section_name.begin(), section_name.end(), callerInformation.project_name);
+ std::copy(section_name.begin(), section_name.end(), callerInformation.feature_name);
LCC_EVENT_TYPE result = acquire_license(&callerInformation, &licLocation, &licenseInfo);
if (result == LICENSE_OK) {
cout << "project [" << section.pItem << "]: license OK" << endl;
@@ -97,6 +96,24 @@
cout << "Virtualiz. detail:" << descByVirtDetail.find(exec_env_info.virtualization_detail)->second << endl;
cout << "Cloud provider :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl;
+ std::vector<license::os::OsAdapterInfo> adapterInfos;
+ FUNCTION_RETURN ret = license::os::getAdapterInfos(adapterInfos);
+ if (ret == FUNCTION_RETURN::FUNC_RET_OK) {
+ for (auto osAdapter : adapterInfos) {
+ cout << "Network adapter [" << osAdapter.id << "]: " << osAdapter.description << endl;
+ cout << " ip address [" << static_cast<unsigned int>(osAdapter.ipv4_address[3]) << "-"
+ << static_cast<unsigned int>(osAdapter.ipv4_address[2]) << "-"
+ << static_cast<unsigned int>(osAdapter.ipv4_address[1]) << "-"
+ << static_cast<unsigned int>(osAdapter.ipv4_address[0]) << "]" << endl;
+ cout << " mac address [";
+ for (int i = 0; i < 8; i++) {
+ // print mac
+ }
+ }
+ } else {
+ cout << "problem in getting adapter informations:" << ret << endl;
+ }
+
license::os::CpuInfo cpu;
cout << "Cpu Vendor :" << cpu.vendor() << endl;
cout << "Cpu Brand :" << cpu.brand() << endl;
--
Gitblit v1.9.1