From 8d405b265285c368df2e9cf1c14acee7532e0ee7 Mon Sep 17 00:00:00 2001
From: nancy.liao <huihui.liao@greentest.com.cn>
Date: ćšć, 29 5æ 2025 18:14:38 +0800
Subject: [PATCH] Merge branch 'develop' of http://139.9.88.116:3000/r/module/open-license-manager into develop
---
src/library/os/execution_environment.hpp | 42 +++++++++++++++++++-----------------------
1 files changed, 19 insertions(+), 23 deletions(-)
diff --git a/src/library/os/execution_environment.hpp b/src/library/os/execution_environment.hpp
index bc503fb..296d403 100644
--- a/src/library/os/execution_environment.hpp
+++ b/src/library/os/execution_environment.hpp
@@ -9,41 +9,37 @@
#define SRC_LIBRARY_OS_VIRTUALIZATION_HPP_
#include <string>
+#include <licensecc/datatypes.h>
+#include "dmi_info.hpp"
+#include "cpu_info.hpp"
namespace license {
namespace os {
-typedef enum { NONE, CONTAINER, VM } VIRTUALIZATION;
+/*
+ * windows bios sometimes reports vm names add execution environment detection from bios
+const char *vmVendors[] = {
+ "VMware", "Microsoft Corporation", "Virtual Machine", "innotek GmbH", "PowerVM", "Bochs", "KVM"};
+*/
-typedef enum {
- PROV_UNKNOWN,
- ON_PREMISE,
- GOOGLE_CLOUD,
- AZURE_CLOUD,
- AWS,
- /**
- * "/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
-} CLOUD_PROVIDER;
+enum CONTAINER_TYPE { NONE, DOCKER, LXC };
class ExecutionEnvironment {
private:
- std::string sys_vendor;
- std::string bios_vendor;
- std::string bios_description;
- //detect if it's a kind of container technology (docker or lxc)
- bool is_container() const;
+ const CpuInfo m_cpu_info;
+ const DmiInfo m_dmi_info;
+ const CONTAINER_TYPE m_container_type;
+
public:
ExecutionEnvironment();
~ExecutionEnvironment(){};
- VIRTUALIZATION getVirtualization() const;
+ LCC_API_VIRTUALIZATION_SUMMARY virtualization() const;
bool is_cloud() const;
- bool is_docker() const;
- CLOUD_PROVIDER getCloudProvider() const;
+ bool is_docker() const { return m_container_type == CONTAINER_TYPE::DOCKER; }
+ // detect if it's a kind of container technology (docker or lxc)
+ bool is_container() const { return m_container_type != CONTAINER_TYPE::NONE; }
+ LCC_API_CLOUD_PROVIDER cloud_provider() const;
+ LCC_API_VIRTUALIZATION_DETAIL virtualization_detail() const;
};
} // namespace os
--
Gitblit v1.9.1