Merge pull request #140 from spodila/fixScalarResCloning

fix cloning of scalar resources

Author: spodila

fenzo-core/src/main/java/com/netflix/fenzo/InternalVMCloner.java

@@ -62,7 +62,14 @@
                 final Map<String, Double> maxScalars = avm.getMaxScalars();
                 if (maxScalars != null && !maxScalars.isEmpty()) {
                     for (String k: maxScalars.keySet())
-                        scalars.compute(k, (s, oldVal) -> oldVal + maxScalars.get(k));
+                        scalars.compute(k, (s, oldVal) -> {
+                            if (oldVal == null)
+                                oldVal = 0.0;
+                            Double aDouble = maxScalars.get(k);
+                            if (aDouble == null)
+                                aDouble = 0.0;
+                            return oldVal + aDouble;
+                        });
                 }
                 final Map<String, Protos.Attribute> attrs = avm.getCurrTotalLease().getAttributeMap();
                 if (attrs != null && !attrs.isEmpty()) {

fenzo-core/src/test/java/com/netflix/fenzo/ShortfallAutoscalerTest.java

@@ -176,10 +176,14 @@ public void testShortfallScaleup2groups() throws Exception {
         // create 3 VMs for group1 and 1 VM for group2
         int hostIdx=0;
         final List<VirtualMachineLease> leases = new ArrayList<>();
-        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus1, cpus1 * memMultiplier, ports, attributes1));
-        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus1, cpus1 * memMultiplier, ports, attributes1));
-        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus1, cpus1 * memMultiplier, ports, attributes1));
-        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus2, cpus2 * memMultiplier, ports, attributes2));
+        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus1, cpus1 * memMultiplier,
+                0, 0, ports, attributes1, Collections.singletonMap("GPU", 1.0)));
+        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus1, cpus1 * memMultiplier,
+                0, 0, ports, attributes1, Collections.singletonMap("GPU", 1.0)));
+        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus1, cpus1 * memMultiplier,
+                0, 0, ports, attributes1, Collections.singletonMap("GPU", 1.0)));
+        leases.add(LeaseProvider.getLeaseOffer("host" + hostIdx++, cpus2, cpus2 * memMultiplier,
+                0, 0, ports, attributes2, Collections.singletonMap("GPU", 2.0)));
         // create 1-cpu tasks to fill VMS equal to two times the max size of group1, and also group2
         for (int i=0; i < (cpus1*rule1.getMaxSize() + cpus2* rule2.getMaxSize()); i++) {
             queue.queueTask(QueuableTaskProvider.wrapTask(qA1, TaskRequestProvider.getTaskRequest(1, memMultiplier, 1)));