gcontini
2020-04-25 8d9dd1046da24ec09bfcfad9fe090b856e202b8b
fix tests
2个文件已修改
19 ■■■■ 已修改文件
src/inspector/inspector.cpp 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/library/os/execution_environment_common.cpp 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/inspector/inspector.cpp
@@ -28,21 +28,6 @@
    {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"},
@@ -90,7 +75,7 @@
    }
    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
    cout << "Cloud provider   :" << descByCloudProvider.find(exec_env_info.cloud_provider)->second << endl
         << "=============" << endl;
    license::os::CpuInfo cpu;
    cout << "Cpu Vendor       :" << cpu.vendor() << endl;
src/library/os/execution_environment_common.cpp
@@ -26,7 +26,7 @@
const unordered_map<string, LCC_API_VIRTUALIZATION_DETAIL> vm_vendors{{"VMWARE", VMWARE},
                                                              {"MICROSOFT", HV},
                                                              {"VITRUAL MACHINE", V_OTHER},
                                                              {"INNOTEK GMBH", V_OTHER},
                                                                      {"INNOTEK GMBH", VIRTUALBOX},
                                                              {"POWERVM", V_OTHER},
                                                              {"BOCHS", V_OTHER},
                                                              {"KVM", KVM}};