Bugfix/cpu topology (#10)

deploy/crds/vms-crd.yaml

@@ -1032,10 +1032,10 @@ spec:
                         diesPerSocket:
                           type: integer
                           default: 0
-                        coresPerSocket:
+                        coresPerDie:
                           type: integer
                           default: 0
-                        threadsPerSocket:
+                        threadsPerCore:
                           type: integer
                           default: 0
                     currentCpus:

org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerConfig.ftl.yaml

@@ -88,9 +88,9 @@ data:
         maximumCpus: ${ parseQuantity(cr.spec.vm.maximumCpus.asString)?c }
         </#if>
         <#if cr.spec.vm.cpuTopology?? >
-        cpuSockets: ${ cr.spec.vm.cpuTopology.cpuSockets.asInt?c }
+        sockets: ${ cr.spec.vm.cpuTopology.sockets.asInt?c }
         diesPerSocket: ${ cr.spec.vm.cpuTopology.diesPerSocket.asInt?c }
-        coresPerSocket: ${ cr.spec.vm.cpuTopology.coresPerSocket.asInt?c }
+        coresPerDie: ${ cr.spec.vm.cpuTopology.coresPerDie.asInt?c }
         threadsPerCore: ${ cr.spec.vm.cpuTopology.threadsPerCore.asInt?c }
         </#if>
         <#if cr.spec.vm.currentCpus?? >

org.jdrupes.vmoperator.runner.qemu/build.gradle

@@ -43,7 +43,7 @@ task tagLatestArchImage(type: Exec) {
     dependsOn buildArchImage
 
     commandLine 'podman', 'tag', "${project.name}-arch:${project.version}",\
-        "${project.name}:latest"
+        "${project.name}-arch:latest"
 }
 
 task buildLatestArchImage {

org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java

@@ -106,7 +106,7 @@ public static class Vm implements Dto {
         public int currentCpus = 1;
 
         /** The cpu sockets. */
-        public int cpuSockets;
+        public int sockets;
 
         /** The dies per socket. */
         public int diesPerSocket;

org.jdrupes.vmoperator.runner.qemu/templates/Standard-VM-latest.ftl.yaml

@@ -87,7 +87,7 @@
     - [ "-cpu", "${ vm.cpuModel }" ]
     <#if vm.maximumCpus gt 1>
     - [ "-smp", "1,maxcpus=${ vm.maximumCpus }\
-        <#if vm.cpuSockets gt 0>,sockets=${ vm.cpuSockets }</#if>\
+        <#if vm.sockets gt 0>,sockets=${ vm.sockets }</#if>\
         <#if vm.diesPerSocket gt 0>,cores=${ vm.diesPerSocket }</#if>\
         <#if vm.coresPerDie gt 0>,cores=${ vm.coresPerDie }</#if>\
         <#if vm.threadsPerCore gt 0>,cores=${ vm.threadsPerCore }</#if>" ]

org.jdrupes.vmoperator.util/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,5 @@
 #
-#Fri Sep 22 15:21:52 CEST 2023
+#Mon Oct 09 18:47:59 CEST 2023
 org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
 org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
@@ -22,12 +22,12 @@ org.eclipse.jdt.core.formatter.blank_lines_after_package=1
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
 org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
 org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
 org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
 org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
@@ -43,8 +43,8 @@ org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invoc
 org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
 org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=true
 org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
@@ -63,8 +63,8 @@ org.eclipse.jdt.core.formatter.alignment_for_type_parameters=16
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
 org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
 org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
 org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert