[cloudstack] branch main updated: maven: Fix build on osx (#6056)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 2f6fc56  maven: Fix build on osx (#6056)
2f6fc56 is described below

commit 2f6fc56e7436174c35b2a093fbba101b30f69fa6
Author: Rohit Yadav <rohityada...@gmail.com>
AuthorDate: Mon Mar 7 14:55:42 2022 +0530

    maven: Fix build on osx (#6056)
    
    kvm: don't read /proc/meminfo on non-Linux environments as part of 
constructor
    
    Co-authored-by: Nicolas Vazquez <nicovazque...@gmail.com>
---
 .../src/main/java/org/apache/cloudstack/utils/linux/MemStat.java    | 4 +++-
 .../cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java | 3 +++
 .../test/java/org/apache/cloudstack/utils/linux/MemStatTest.java    | 6 ++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git 
a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java
 
b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java
index d62e1a2..f89ae27 100644
--- 
a/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java
+++ 
b/plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/linux/MemStat.java
@@ -48,7 +48,9 @@ public class MemStat {
     public MemStat(long reservedMemory, long overCommitMemory) {
         this.reservedMemory = reservedMemory;
         this.overCommitMemory = overCommitMemory;
-        this.refresh();
+        if (System.getProperty("os.name").equals("Linux")) {
+            this.refresh();
+        }
     }
 
     public long getTotal() {
diff --git 
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
 
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
index 1f65458..8429a9e 100644
--- 
a/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
+++ 
b/plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java
@@ -5557,6 +5557,9 @@ public class LibvirtComputingResourceTest {
 
     @Test
     public void testMemoryFreeInKBsDomainReturningOfSomeMemoryStatistics() 
throws LibvirtException {
+        if (!System.getProperty("os.name").equals("Linux")) {
+            return;
+        }
         LibvirtComputingResource libvirtComputingResource = new 
LibvirtComputingResource();
 
         MemoryStatistic[] mem = createMemoryStatisticFreeMemory100();
diff --git 
a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java
 
b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java
index 50d4b00..57cb381 100644
--- 
a/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java
+++ 
b/plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/linux/MemStatTest.java
@@ -46,6 +46,9 @@ public class MemStatTest {
     @Test
     public void getMemInfoParseTest() {
         MemStat memStat = new MemStat();
+        if (!System.getProperty("os.name").equals("Linux")) {
+            return;
+        }
 
         Assert.assertEquals(memStat.getTotal(), 5970161664L);
         Assert.assertEquals(memStat.getAvailable(), 3164520448L);
@@ -56,6 +59,9 @@ public class MemStatTest {
     @Test
     public void reservedMemoryTest() {
         MemStat memStat = new MemStat(1024, 2048);
+        if (!System.getProperty("os.name").equals("Linux")) {
+            return;
+        }
         Assert.assertEquals(memStat.getTotal(), 5970162688L);
     }
 }