include mem_total to scc registration

uyuni-project · Nov 16, 2023 · 04daab9 · 04daab9
1 parent b123307
commit 04daab9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/java/code/src/com/suse/scc/model/SCCHwInfoJson.java b/java/code/src/com/suse/scc/model/SCCHwInfoJson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 SUSE LLC
+ * Copyright (c) 2023 SUSE LLC
  *
  * This software is licensed to you under the GNU General Public License,
  * version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -23,6 +23,10 @@ public class SCCHwInfoJson {
 
     private int cpus;
     private int sockets;
+
+    @SerializedName("mem_total")
+    private int memTotal;
+
     private String arch;
     private String uuid;
     private String hypervisor;
@@ -77,4 +81,12 @@ public String getCloudProvider() {
     public void setCloudProvider(String cloudProviderIn) {
         cloudProvider = cloudProviderIn;
     }
+
+    public int getMemTotal() {
+        return memTotal;
+    }
+
+    public void setMemTotal(int memTotalIn) {
+        memTotal = memTotalIn;
+    }
 }
diff --git a/java/code/src/com/suse/scc/registration/SCCSystemRegistrationSystemDataAcquisitor.java b/java/code/src/com/suse/scc/registration/SCCSystemRegistrationSystemDataAcquisitor.java
@@ -102,6 +102,7 @@ private SCCRegisterSystemJson getPayload(SCCRegCacheItem rci) {
             ofNullable(srv.getVirtualInstance().getUuid())
                     .ifPresent(u -> hwInfo.setUuid(u.replaceAll("(\\w{8})(\\w{4})(\\w{4})(\\w{4})(\\w{12})",
                             "$1-$2-$3-$4-$5")));
+            hwInfo.setMemTotal(srv.getVirtualInstance().getTotalMemory().intValue());
         }
 
         String login = rci.getOptSccLogin().orElseGet(() -> {

diff --git a/...code/src/com/suse/scc/test/registration/SCCSystemRegistrationCreateUpdateSystemsTest.java b/...code/src/com/suse/scc/test/registration/SCCSystemRegistrationCreateUpdateSystemsTest.java
@@ -198,9 +198,12 @@ public int getCallCnt() {
         }
     }
 
+
     /**
      * Creates a Default {@link TestSCCWebClient} instance for testing purposes.
      * All systems are updated successfully.
+     * @return a default SccWebClient instance for testing purposes
+     * @throws URISyntaxException
      */
     public TestSCCWebClient getDefaultTestSCCWebClient() throws URISyntaxException {
         TestSCCWebClient sccWebClient = new TestSCCWebClient(new SCCConfig(