Merge branch 'OpenStack-nc' into 'proactive-dev'

OpenStack retrieve Linux NC

See merge request !169

.gitlab-ci.yml

@@ -53,6 +53,7 @@ build:amq-message-java-library:
   only:
     - master
     - morphemic-rc1.5
+    - openstack-nc
   script:
     - $AMQ_MESSAGE_JAVA_LIBRARY_CLI clean install
   artifacts:
@@ -138,6 +139,7 @@ deploy:scheduling-abstraction-layer:
     - master
     - morphemic-rc1.5
     - proactive-dev
+    - OpenStack-nc
   dependencies:
     - build:scheduling-abstraction-layer
   script:

scheduling-abstraction-layer/src/main/java/org/activeeon/morphemic/service/NodeCandidateUtils.java

@@ -10,10 +10,8 @@ import org.json.JSONObject;
 
 import java.io.IOException;
 import java.math.BigDecimal;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
+
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -257,26 +255,47 @@ public class NodeCandidateUtils {
 
             //TODO: (Optimization) An images per region map structure <region,[image1,image2]> could be the best here.
             // It can reduce the getNodeCandidates calls to PA.
+            List<String> entries = new LinkedList<>();
+            List<String> openstackOsList = Arrays.asList("Ubuntu","Fedora","Centos","Debian");
             consolidatedImages.forEach(image -> {
                 String region = image.optString("location");
                 String imageReq;
+                String os = (String) ((JSONObject) image.get("operatingSystem")).get("family");
+                os = os.substring(0, 1).toUpperCase() + os.substring(1);
+                String pair =os+":"+region;
                 switch (paCloud.getCloudProviderName()) {
                     case "aws-ec2":
                         imageReq = "Linux";
                         break;
                     case "openstack":
-                        imageReq = "linux";
+                        imageReq = os;
                         break;
                     default:
                         throw new IllegalArgumentException("The infrastructure " + paCloud.getCloudProviderName() + " is not handled yet.");
                 }
-                JSONArray nodeCandidates = connectorIaasGateway.getNodeCandidates(paCloud.getDummyInfrastructureName(),
-                        region, imageReq);
-                nodeCandidates.forEach(nc -> {
-                    JSONObject nodeCandidate = (JSONObject) nc;
-                    EntityManagerHelper.persist(createLocation(nodeCandidate, paCloud));
-                    EntityManagerHelper.persist(createNodeCandidate(nodeCandidate, image, paCloud));
-                });
+
+                if (paCloud.getCloudProviderName().equals("openstack")){
+                    if((!entries.contains(pair)) && openstackOsList.contains(os)) {
+                        entries.add(pair);
+                        JSONArray nodeCandidates = connectorIaasGateway.getNodeCandidates(paCloud.getDummyInfrastructureName(),
+                                region, imageReq);
+                        nodeCandidates.forEach(nc -> {
+                            JSONObject nodeCandidate = (JSONObject) nc;
+                            EntityManagerHelper.persist(createLocation(nodeCandidate, paCloud));
+                            EntityManagerHelper.persist(createNodeCandidate(nodeCandidate, image, paCloud));
+                        });
+
+                    }
+                }
+                else {
+                    JSONArray nodeCandidates = connectorIaasGateway.getNodeCandidates(paCloud.getDummyInfrastructureName(),
+                            region, imageReq);
+                    nodeCandidates.forEach(nc -> {
+                        JSONObject nodeCandidate = (JSONObject) nc;
+                        EntityManagerHelper.persist(createLocation(nodeCandidate, paCloud));
+                        EntityManagerHelper.persist(createNodeCandidate(nodeCandidate, image, paCloud));
+                    });
+                }
             });
         });