membersUsage, String memberId) {
double debt = 0;
+ if (localMemberId.equals(memberId)) {
+ if (prioritizeLocal) {
+ return Double.MAX_VALUE;
+ } else {
+ return -1;
+ }
+ }
+
if (membersUsage.containsKey(memberId)) {
debt = membersUsage.get(memberId).getConsumed()
- membersUsage.get(memberId).getDonated();
diff --git a/src/main/java/org/fogbowcloud/manager/core/plugins/util/CloudInitUserDataBuilder.java b/src/main/java/org/fogbowcloud/manager/core/plugins/util/CloudInitUserDataBuilder.java
new file mode 100644
index 00000000..6a210269
--- /dev/null
+++ b/src/main/java/org/fogbowcloud/manager/core/plugins/util/CloudInitUserDataBuilder.java
@@ -0,0 +1,482 @@
+package org.fogbowcloud.manager.core.plugins.util;
+/*
+ * Copyright 2008-2010 Xebia and the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.mail.MessagingException;
+import javax.mail.Session;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
+import org.apache.commons.codec.binary.Base64;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Throwables;
+import com.google.common.collect.Sets;
+import com.google.common.io.CharStreams;
+
+/**
+ *
+ * Build a CloudInit
+ * UserData file.
+ *
+ *
+ * Sample:
+ *
+ *
+ *
+ *
+ * // base64 encoded user data
+ * String userData = CloudInitUserDataBuilder.start() //
+ * .addShellScript(shellScript) //
+ * .addCloudConfig(cloudConfig) //
+ * .buildBase64UserData();
+ *
+ * RunInstancesRequest req = new RunInstancesRequest() //
+ * .withInstanceType("t1.micro") //
+ * .withImageId("ami-47cefa33") // amazon-linux in eu-west-1 region
+ * .withMinCount(1).withMaxCount(1) //
+ * .withSecurityGroupIds("default") //
+ * .withKeyName("my-key") //
+ * .withUserData(userData);
+ *
+ * RunInstancesResult runInstances = ec2.runInstances(runInstancesRequest);
+ *
+ *
+ *
+ * Inspired by ubuntu-on-ec2 cloud-utils write-mime-multipart python script.
+ *
+ *
+ * @see com.amazonaws.services.ec2.model.RunInstancesRequest#withUserData(String)
+ * @see com.amazonaws.services.ec2.AmazonEC2.runInstances(RunInstancesRequest)
+ *
+ * @author Cyrille Le Clerc
+ */
+public class CloudInitUserDataBuilder {
+
+ /**
+ * File types supported by CloudInit
+ */
+ public enum FileType {
+ /**
+ *
+ * This content is "boothook" data. It is stored in a file under
+ * /var/lib/cloud and then executed immediately. This is the earliest
+ * "hook" available. Note, that there is no mechanism provided for
+ * running only once. The boothook must take care of this itself. It is
+ * provided with the instance id in the environment variable
+ * "INSTANCE_ID". This could be made use of to provide a
+ * 'once-per-instance'
+ *
+ */
+ CLOUD_BOOTHOOK("text/cloud-boothook", "cloudinit-cloud-boothook.txt"), //
+ /**
+ *
+ * This content is "cloud-config" data. See the examples for a commented
+ * example of supported config formats.
+ *
+ *
+ * Example: cloud-config.txt
+ *
+ */
+ CLOUD_CONFIG("text/cloud-config", "cloudinit-cloud-config.txt"), //
+ /**
+ *
+ * This content is a "include" file. The file contains a list of urls,
+ * one per line. Each of the URLs will be read, and their content will
+ * be passed through this same set of rules. Ie, the content read from
+ * the URL can be gzipped, mime-multi-part, or plain text
+ *
+ *
+ * Example: include.txt
+ *
+ */
+ INCLUDE_URL("text/x-include-url", "cloudinit-x-include-url.txt"), //
+ /**
+ *
+ * This is a 'part-handler'. It will be written to a file in
+ * /var/lib/cloud/data based on its filename. This must be python code
+ * that contains a list_types method and a handle_type method. Once the
+ * section is read the 'list_types' method will be called. It must
+ * return a list of mime-types that this part-handler handlers.
+ *
+ *
+ * Example: part-handler.txt
+ *
+ */
+ PART_HANDLER("text/part-handler", "cloudinit-part-handler.txt"), //
+ /**
+ *
+ * Script will be executed at "rc.local-like" level during first boot.
+ * rc.local-like means "very late in the boot sequence"
+ *
+ *
+ * Example: user-script.txt
+ *
+ */
+ SHELL_SCRIPT("text/x-shellscript", "cloudinit-userdata-script.txt"), //
+ /**
+ *
+ * Content is placed into a file in /etc/init, and will be consumed by
+ * upstart as any other upstart job.
+ *
+ *
+ * Example: upstart-rclocal.txt
+ *
+ */
+ UPSTART_JOB("text/upstart-job", "cloudinit-upstart-job.txt");
+
+ /**
+ * Name of the file.
+ */
+ private final String fileName;
+ /**
+ * Mime Type of the file.
+ */
+ private final String mimeType;
+
+ private FileType( String mimeType, String fileName) {
+ this.mimeType = Preconditions.checkNotNull(mimeType);
+ this.fileName = Preconditions.checkNotNull(fileName);
+ }
+
+ /**
+ * @return name of the file
+ */
+
+ public String getFileName() {
+ return fileName;
+ }
+
+ /**
+ * e.g. "cloud-config" for "text/cloud-config"
+ */
+
+ public String getMimeTextSubType() {
+ return getMimeType().substring("text/".length());
+ }
+
+ /**
+ * e.g. "text/cloud-config"
+ */
+
+ public String getMimeType() {
+ return mimeType;
+ }
+
+ @Override
+ public String toString() {
+ return name() + "[" + mimeType + "]";
+ }
+ }
+
+ /**
+ * Initiates a new instance of the builder with the "UTF-8" charset.
+ */
+ public static CloudInitUserDataBuilder start() {
+ return new CloudInitUserDataBuilder(Charsets.UTF_8);
+ }
+
+ /**
+ * Initiates a new instance of the builder.
+ *
+ * @param charset
+ * used to generate the mime message.
+ */
+ public static CloudInitUserDataBuilder start( String charset) {
+ return new CloudInitUserDataBuilder(Charset.forName(charset));
+ }
+
+ /**
+ * File types already added because cloud-init only supports one file of
+ * each type.
+ */
+ private final Set alreadyAddedFileTypes = Sets.newHashSet();
+
+ /**
+ * Charset used to generate the mime message.
+ */
+ private final Charset charset;
+
+ /**
+ * Mime message under creation
+ */
+ private final MimeMessage userDataMimeMessage;
+
+ /**
+ * Mime message's content under creation
+ */
+ private final MimeMultipart userDataMultipart;
+
+ private CloudInitUserDataBuilder( Charset charset) {
+ super();
+ userDataMimeMessage = new MimeMessage(Session.getDefaultInstance(new Properties()));
+ userDataMultipart = new MimeMultipart();
+ try {
+ userDataMimeMessage.setContent(userDataMultipart);
+ } catch (MessagingException e) {
+ throw Throwables.propagate(e);
+ }
+ this.charset = Preconditions.checkNotNull(charset, "'charset' can NOT be null");
+ }
+
+ /**
+ * Add a boot-hook file.
+ *
+ * @see FileType#CLOUD_BOOTHOOK
+ * @param bootHook
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a boot-hook file was already added to this cloud-init mime
+ * message.
+ */
+ public CloudInitUserDataBuilder addBootHook( Readable bootHook) {
+ return addFile(FileType.CLOUD_BOOTHOOK, bootHook);
+ }
+
+ /**
+ * Add a cloud-config file.
+ *
+ * @see FileType#CLOUD_CONFIG
+ * @param cloudConfig
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a cloud-config file was already added to this cloud-init mime
+ * message.
+ */
+ public CloudInitUserDataBuilder addCloudConfig(Readable cloudConfig) {
+ return addFile(FileType.CLOUD_CONFIG, cloudConfig);
+ }
+
+ /**
+ * Add a cloud-config file.
+ *
+ * @see FileType#CLOUD_CONFIG
+ * @param cloudConfig
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a cloud-config file was already added to this cloud-init mime
+ * message.
+ */
+ public CloudInitUserDataBuilder addCloudConfig(String cloudConfig) {
+ return addCloudConfig(new StringReader(cloudConfig));
+ }
+
+ /**
+ * Add given file in to the cloud-init mime message.
+ *
+ * @param fileType
+ * @param in
+ * file to add as readable
+ * @return the builder
+ * @throws IllegalArgumentException
+ * the given fileType was already added to this
+ * cloud-init mime message.
+ */
+
+ public CloudInitUserDataBuilder addFile( FileType fileType, Readable in) throws IllegalArgumentException {
+ Preconditions.checkNotNull(fileType, "'fileType' can NOT be null");
+ Preconditions.checkNotNull(in, "'in' can NOT be null");
+ Preconditions.checkArgument(!alreadyAddedFileTypes.contains(fileType), "%s as already been added", fileType);
+ alreadyAddedFileTypes.add(fileType);
+
+ try {
+ StringWriter sw = new StringWriter();
+ CharStreams.copy(in, sw);
+ MimeBodyPart mimeBodyPart = new MimeBodyPart();
+ mimeBodyPart.setText(sw.toString(), charset.name(), fileType.getMimeTextSubType());
+ mimeBodyPart.setFileName(fileType.getFileName());
+ userDataMultipart.addBodyPart(mimeBodyPart);
+
+ } catch (IOException e) {
+ throw Throwables.propagate(e);
+ } catch (MessagingException e) {
+ throw Throwables.propagate(e);
+ }
+ return this;
+ }
+
+ /**
+ * Add a include-url file.
+ *
+ * @see FileType#INCLUDE_URL
+ * @param includeUrl
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a include-url file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addIncludeUrl( Readable includeUrl) {
+ return addFile(FileType.INCLUDE_URL, includeUrl);
+ }
+
+ /**
+ * Add a include-url file.
+ *
+ * @see FileType#INCLUDE_URL
+ * @param includeUrl
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a include-url file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addIncludeUrl( String includeUrl) {
+ return addIncludeUrl(new StringReader(includeUrl));
+ }
+
+ /**
+ * Add a part-handler file.
+ *
+ * @see FileType#PART_HANDLER
+ * @param partHandler
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a part-handler file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addPartHandler( Readable partHandler) {
+ return addFile(FileType.PART_HANDLER, partHandler);
+ }
+
+ /**
+ * Add a part-handler file.
+ *
+ * @see FileType#PART_HANDLER
+ * @param partHandler
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a part-handler file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addPartHandler( String partHandler) {
+ return addPartHandler(new StringReader(partHandler));
+ }
+
+ /**
+ * Add a shell-script file.
+ *
+ * @see FileType#SHELL_SCRIPT
+ * @param shellScript
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a shell-script file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addShellScript( Readable shellScript) {
+ return addFile(FileType.SHELL_SCRIPT, shellScript);
+ }
+
+ /**
+ * Add a shell-script file.
+ *
+ * @see FileType#SHELL_SCRIPT
+ * @param shellScript
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a shell-script file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addShellScript( String shellScript) {
+ return addShellScript(new StringReader(shellScript));
+ }
+
+ /**
+ * Add a upstart-job file.
+ *
+ * @see FileType#UPSTART_JOB
+ * @param shellScript
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a upstart-job file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addUpstartJob( Readable in) {
+ return addFile(FileType.UPSTART_JOB, in);
+ }
+
+ /**
+ * Add a upstart-job file.
+ *
+ * @see FileType#UPSTART_JOB
+ * @param shellScript
+ * @return the builder
+ * @throws IllegalArgumentException
+ * a upstart-job file was already added to this cloud-init mime
+ * message.
+ */
+
+ public CloudInitUserDataBuilder addUpstartJob( String upstartJob) {
+ return addUpstartJob(new StringReader(upstartJob));
+ }
+
+ /**
+ * Build the user-data mime message.
+ *
+ * @return the generate mime message
+ */
+
+ public String buildUserData() {
+ try {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ userDataMimeMessage.writeTo(baos);
+ return new String(baos.toByteArray(), this.charset);
+
+ } catch (MessagingException e) {
+ throw Throwables.propagate(e);
+ } catch (IOException e) {
+ throw Throwables.propagate(e);
+ }
+ }
+
+ /**
+ * Build a base64 encoded user-data mime message.
+ *
+ * @return the base64 encoded encoded mime message
+ */
+
+ public String buildBase64UserData() {
+ return Base64.encodeBase64String(buildUserData().getBytes());
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/org/fogbowcloud/manager/core/plugins/util/SshHelper.java b/src/main/java/org/fogbowcloud/manager/core/plugins/util/SshHelper.java
new file mode 100644
index 00000000..814724d3
--- /dev/null
+++ b/src/main/java/org/fogbowcloud/manager/core/plugins/util/SshHelper.java
@@ -0,0 +1,93 @@
+package org.fogbowcloud.manager.core.plugins.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.security.PublicKey;
+
+import net.schmizz.sshj.SSHClient;
+import net.schmizz.sshj.connection.channel.direct.Session;
+import net.schmizz.sshj.connection.channel.direct.Session.Command;
+import net.schmizz.sshj.transport.verification.HostKeyVerifier;
+import net.schmizz.sshj.xfer.FileSystemFile;
+import net.schmizz.sshj.xfer.scp.SCPFileTransfer;
+
+public class SshHelper {
+
+ private SSHClient client;
+ private Session session;
+
+ public SshHelper() {
+ this(new SSHClient());
+ }
+
+ public SshHelper(SSHClient ssh) {
+ this.client = ssh;
+ addBlankHostKeyVerifier(client);
+ }
+
+ private void addBlankHostKeyVerifier(SSHClient ssh) {
+ ssh.addHostKeyVerifier(new HostKeyVerifier() {
+ @Override
+ public boolean verify(String arg0, int arg1, PublicKey arg2) {
+ return true;
+ }
+ });
+ }
+
+ public SSHClient getSshClient() {
+ return client;
+ }
+
+ public Command doSshExecution(String command) throws IOException {
+ session = client.startSession();
+ Command cmd = session.exec(command);
+ cmd.join();
+ return cmd;
+ }
+
+ public void disconnect() throws IOException {
+ if (session != null) {
+ session.close();
+ session = null;
+ }
+ client.disconnect();
+ client.close();
+ }
+
+ public void doScpDownload(String localFilePath, String remoteFilePath)
+ throws IOException {
+ FileSystemFile localFile = new FileSystemFile(localFilePath);
+ client.newSCPFileTransfer().download(remoteFilePath, localFile);
+ }
+
+ public void doScpUpload(String localFilePath, String remoteFilePath)
+ throws IOException {
+ doSshExecution("mkdir -p " + new File(remoteFilePath).getParent());
+ FileSystemFile localFile = new FileSystemFile(localFilePath);
+ SCPFileTransfer scp = client.newSCPFileTransfer();
+ scp.upload(localFile, remoteFilePath);
+ }
+
+ public void connect(String host, int port, String userName,
+ String privateKeyFilePath, int timeOut) throws IOException {
+ client = new SSHClient();
+ if (timeOut > 0) {
+ client.setConnectTimeout(timeOut);
+ }
+ addBlankHostKeyVerifier(client);
+ client.connect(host, port);
+ if (userName != null && privateKeyFilePath != null) {
+ client.authPublickey(userName, privateKeyFilePath);
+ }
+ }
+
+ public void connect(String address, int port, String userName,
+ String privateKeyFilePath) throws IOException {
+ connect(address, port, userName, privateKeyFilePath, 0);
+ }
+
+ public void connect(String address, int port) throws IOException {
+ connect(address, port, null, null, 0);
+ }
+
+}
diff --git a/src/main/java/org/fogbowcloud/manager/occi/MemberServerResource.java b/src/main/java/org/fogbowcloud/manager/occi/MemberServerResource.java
index 13c7a434..811582c8 100644
--- a/src/main/java/org/fogbowcloud/manager/occi/MemberServerResource.java
+++ b/src/main/java/org/fogbowcloud/manager/occi/MemberServerResource.java
@@ -1,9 +1,12 @@
package org.fogbowcloud.manager.occi;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
import org.fogbowcloud.manager.core.model.FederationMember;
-import org.fogbowcloud.manager.core.model.Flavor;
+import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.occi.core.HeaderUtils;
import org.restlet.engine.adapter.HttpRequest;
import org.restlet.resource.Get;
@@ -28,24 +31,19 @@ public String fetch() {
private String generateResponse(List federationMembers) {
StringBuilder response = new StringBuilder();
for (FederationMember federationMember : federationMembers) {
- String id = federationMember.getResourcesInfo().getId();
- response.append("id=").append(id).append(";");
- String cpuIdle = federationMember.getResourcesInfo().getCpuIdle();
- response.append("cpuIdle=").append(cpuIdle).append(";");
- String cpuInUse = federationMember.getResourcesInfo().getCpuInUse();
- response.append("cpuInUse=").append(cpuInUse).append(";");
- String memIdle = federationMember.getResourcesInfo().getMemIdle();
- response.append("memIdle=").append(memIdle).append(";");
- String memInUse = federationMember.getResourcesInfo().getMemInUse();
- response.append("memInUse=").append(memInUse).append(";");
+ Map resourcesInfoMap = new HashMap();
+ ResourcesInfo resourcesInfo = federationMember.getResourcesInfo();
+ resourcesInfoMap.put("id", resourcesInfo.getId());
+ resourcesInfoMap.put("cpuIdle", resourcesInfo.getCpuIdle());
+ resourcesInfoMap.put("cpuInUse", resourcesInfo.getCpuInUse());
+ resourcesInfoMap.put("memIdle", resourcesInfo.getMemIdle());
+ resourcesInfoMap.put("memInUse", resourcesInfo.getMemInUse());
+ resourcesInfoMap.put("instancesIdle", resourcesInfo.getInstancesIdle());
+ resourcesInfoMap.put("instancesInUse", resourcesInfo.getInstancesInUse());
- if (federationMember.getResourcesInfo().getFlavors() != null) {
- for (Flavor flavor : federationMember.getResourcesInfo().getFlavors()) {
- String nameFlavor = flavor.getName();
- Integer capacityFlavor = flavor.getCapacity();
- response.append("flavor: '").append(nameFlavor).append(", capacity=\"")
- .append(capacityFlavor).append("\"';");
- }
+ for (Entry resourceInfoEntry : resourcesInfoMap.entrySet()) {
+ response.append(resourceInfoEntry.getKey()).append("=")
+ .append(resourceInfoEntry.getValue()).append(";");
}
response.append("\n");
}
diff --git a/src/main/java/org/fogbowcloud/manager/occi/instance/Instance.java b/src/main/java/org/fogbowcloud/manager/occi/instance/Instance.java
index 4f8ca300..02e77497 100644
--- a/src/main/java/org/fogbowcloud/manager/occi/instance/Instance.java
+++ b/src/main/java/org/fogbowcloud/manager/occi/instance/Instance.java
@@ -13,6 +13,7 @@ public class Instance {
public static final String PREFIX_DEFAULT_INSTANCE = "X-OCCI-Location: ";
public static final String SSH_PUBLIC_ADDRESS_ATT = "org.fogbowcloud.request.ssh-public-address";
+ public static final String SSH_USERNAME_ATT = "org.fogbowcloud.request.ssh-username";
private static final String PREFIX_DEFAULT_ATTRIBUTE = "X-OCCI-Attribute: ";
private static final String CATEGORY = "Category:";
diff --git a/src/main/java/org/fogbowcloud/manager/occi/request/Request.java b/src/main/java/org/fogbowcloud/manager/occi/request/Request.java
index 23bbf1af..6729050e 100644
--- a/src/main/java/org/fogbowcloud/manager/occi/request/Request.java
+++ b/src/main/java/org/fogbowcloud/manager/occi/request/Request.java
@@ -48,6 +48,11 @@ public Request(String id, Token federationToken, Token localToken,
this.dateUtils = dateUtils;
setState(RequestState.OPEN);
}
+
+ public Request(Request request) {
+ this(request.getId(), request.getFederationToken(), request.getLocalToken(), request.getCategories(),
+ request.getxOCCIAtt(), request.isLocal, request.getRequestingMemberId());
+ }
public List getCategories() {
if (categories == null) {
@@ -199,4 +204,5 @@ public boolean isExpired() {
long now = new DateUtils().currentTimeMillis();
return expirationDate.getTime() < now;
}
+
}
\ No newline at end of file
diff --git a/src/main/java/org/fogbowcloud/manager/xmpp/ManagerPacketHelper.java b/src/main/java/org/fogbowcloud/manager/xmpp/ManagerPacketHelper.java
index 5afca3c7..7d539a4f 100644
--- a/src/main/java/org/fogbowcloud/manager/xmpp/ManagerPacketHelper.java
+++ b/src/main/java/org/fogbowcloud/manager/xmpp/ManagerPacketHelper.java
@@ -3,7 +3,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -15,7 +14,6 @@
import org.dom4j.Element;
import org.fogbowcloud.manager.core.AsynchronousRequestCallback;
import org.fogbowcloud.manager.core.model.FederationMember;
-import org.fogbowcloud.manager.core.model.Flavor;
import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.occi.core.Category;
import org.fogbowcloud.manager.occi.core.ErrorType;
@@ -54,14 +52,8 @@ public static void iAmAlive(ResourcesInfo resourcesInfo, String rendezvousAddres
statusEl.addElement("cpu-inuse").setText(resourcesInfo.getCpuInUse());
statusEl.addElement("mem-idle").setText(resourcesInfo.getMemIdle());
statusEl.addElement("mem-inuse").setText(resourcesInfo.getMemInUse());
- List flavours = resourcesInfo.getFlavors();
- for (Flavor f : flavours) {
- Element flavorElement = statusEl.addElement("flavor");
- flavorElement.addElement("name").setText(f.getName());
- flavorElement.addElement("cpu").setText(f.getCpu());
- flavorElement.addElement("mem").setText(f.getMem());
- flavorElement.addElement("capacity").setText(f.getCapacity().toString());
- }
+ statusEl.addElement("instances-idle").setText(resourcesInfo.getInstancesIdle());
+ statusEl.addElement("instances-inuse").setText(resourcesInfo.getInstancesInUse());
packetSender.syncSendPacket(iq);
}
@@ -122,52 +114,44 @@ private static ArrayList getMembersFromIQ(IQ responseFromWhoIs
Attribute id = itemEl.attribute("id");
Element statusEl = itemEl.element("status");
- String cpuIdle = statusEl.element("cpu-idle").getText();
- String cpuInUse = statusEl.element("cpu-inuse").getText();
- String memIdle = statusEl.element("mem-idle").getText();
- String memInUse = statusEl.element("mem-inuse").getText();
-
- List flavoursList = new LinkedList();
- Iterator flavourIterator = statusEl.elementIterator("flavor");
- while (flavourIterator.hasNext()) {
- Element flavour = (Element) flavourIterator.next();
- String name = flavour.element("name").getText();
- String cpu = flavour.element("cpu").getText();
- String mem = flavour.element("mem").getText();
- int capacity = Integer.parseInt(flavour.element("capacity").getText());
- Flavor flavor = new Flavor(name, cpu, mem, capacity);
- flavoursList.add(flavor);
- }
+ String cpuIdle = statusEl.elementText("cpu-idle");
+ String cpuInUse = statusEl.elementText("cpu-inuse");
+ String memIdle = statusEl.elementText("mem-idle");
+ String memInUse = statusEl.elementText("mem-inuse");
+ String instancesIdle = statusEl.elementText("instances-idle");
+ String instancesInUse = statusEl.elementText("instances-inuse");
ResourcesInfo resources = new ResourcesInfo(id.getValue(), cpuIdle, cpuInUse, memIdle,
- memInUse, flavoursList);
+ memInUse, instancesIdle, instancesInUse);
FederationMember item = new FederationMember(resources);
aliveItems.add(item);
}
return aliveItems;
}
- public static void asynchronousRemoteRequest(Request request, String memberAddress,
- Token userFederationToken, AsyncPacketSender packetSender, final AsynchronousRequestCallback callback) {
+ public static void asynchronousRemoteRequest(String requestId, List categories,
+ Map xOCCIAttr, String memberAddress,
+ Token userFederationToken, AsyncPacketSender packetSender,
+ final AsynchronousRequestCallback callback) {
IQ iq = new IQ();
- iq.setID(request.getId());
+ iq.setID(requestId);
iq.setTo(memberAddress);
iq.setType(Type.set);
Element queryEl = iq.getElement().addElement("query",
ManagerXmppComponent.REQUEST_NAMESPACE);
- for (Category category : request.getCategories()) {
+ for (Category category : categories) {
Element categoryEl = queryEl.addElement("category");
categoryEl.addElement("class").setText(category.getCatClass());
categoryEl.addElement("term").setText(category.getTerm());
categoryEl.addElement("scheme").setText(category.getScheme());
}
- for (Entry xOCCIEntry : request.getxOCCIAtt().entrySet()) {
+ for (Entry xOCCIEntry : xOCCIAttr.entrySet()) {
Element attributeEl = queryEl.addElement("attribute");
attributeEl.addAttribute("var", xOCCIEntry.getKey());
attributeEl.addElement("value").setText(xOCCIEntry.getValue());
}
Element requestEl = queryEl.addElement("request");
- requestEl.addElement("id").setText(request.getId());
+ requestEl.addElement("id").setText(requestId);
if (userFederationToken != null) {
Element tokenEl = queryEl.addElement("token");
diff --git a/src/test/java/org/fogbowcloud/manager/core/TestForwardedToken.java b/src/test/java/org/fogbowcloud/manager/core/TestForwardedToken.java
index 3dab75dc..ba6b2942 100644
--- a/src/test/java/org/fogbowcloud/manager/core/TestForwardedToken.java
+++ b/src/test/java/org/fogbowcloud/manager/core/TestForwardedToken.java
@@ -36,7 +36,8 @@ public void testTokenBeingForwarded() {
new HashMap(), true, DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
request1.setState(RequestState.OPEN);
- ManagerPacketHelper.asynchronousRemoteRequest(request1, "member1", new Token("accessId", "user",
+ ManagerPacketHelper.asynchronousRemoteRequest(request1.getId(), request1.getCategories(),
+ request1.getxOCCIAtt(), "member1", new Token("accessId", "user",
null, null), packetSender, null);
Mockito.verify(packetSender).sendPacket(Mockito.argThat(new ArgumentMatcher() {
@@ -63,7 +64,8 @@ public void testTokenNotBeingForwarded() {
new HashMap(), true, DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
request1.setState(RequestState.OPEN);
- ManagerPacketHelper.asynchronousRemoteRequest(request1, "member1", null, packetSender, null);
+ ManagerPacketHelper.asynchronousRemoteRequest(request1.getId(), request1.getCategories(),
+ request1.getxOCCIAtt(), "member1", null, packetSender, null);
Mockito.verify(packetSender).sendPacket(Mockito.argThat(new ArgumentMatcher() {
@Override
diff --git a/src/test/java/org/fogbowcloud/manager/core/TestManagerController.java b/src/test/java/org/fogbowcloud/manager/core/TestManagerController.java
index 997e0103..e448613d 100644
--- a/src/test/java/org/fogbowcloud/manager/core/TestManagerController.java
+++ b/src/test/java/org/fogbowcloud/manager/core/TestManagerController.java
@@ -1,5 +1,8 @@
package org.fogbowcloud.manager.core;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.security.cert.CertificateException;
import java.util.ArrayList;
@@ -9,6 +12,12 @@
import java.util.List;
import java.util.Map;
+import javax.mail.MessagingException;
+
+import net.schmizz.sshj.connection.channel.direct.Session.Command;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
import org.dom4j.Element;
import org.fogbowcloud.manager.core.model.DateUtils;
import org.fogbowcloud.manager.core.model.FederationMember;
@@ -19,6 +28,7 @@
import org.fogbowcloud.manager.core.plugins.IdentityPlugin;
import org.fogbowcloud.manager.core.plugins.openstack.KeystoneIdentityPlugin;
import org.fogbowcloud.manager.core.plugins.openstack.OpenStackOCCIComputePlugin;
+import org.fogbowcloud.manager.core.plugins.util.SshHelper;
import org.fogbowcloud.manager.core.util.DefaultDataTestHelper;
import org.fogbowcloud.manager.core.util.ManagerTestHelper;
import org.fogbowcloud.manager.occi.core.Category;
@@ -116,7 +126,7 @@ public void testSubmitLocalUserRequests() throws InterruptedException {
@SuppressWarnings("unchecked")
@Test
public void testSubmitFederationUserRequests() throws InterruptedException {
- ResourcesInfo resourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo resourcesInfo = new ResourcesInfo("", "", "", "", "", "");
resourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
@@ -172,7 +182,7 @@ public void testSubmitToGreenSitter() {
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
- ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
localResourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
Mockito.when(
@@ -242,10 +252,10 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
}
}).when(packetSender).addPacketCallback(Mockito.any(Packet.class), Mockito.any(PacketCallback.class));
- ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
localResourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
- ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
remoteResourcesInfo.setId(DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
@@ -301,10 +311,10 @@ public void testRemoveForwardedRequestAfterTimeout() throws InterruptedException
AsyncPacketSender packetSender = Mockito.mock(AsyncPacketSender.class);
managerController.setPacketSender(packetSender);
- ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
localResourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
- ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
remoteResourcesInfo.setId(DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
@@ -375,10 +385,10 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
}
}).when(packetSender).addPacketCallback(Mockito.any(Packet.class), Mockito.any(PacketCallback.class));
- ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
localResourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
- ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
remoteResourcesInfo.setId(DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
@@ -444,10 +454,10 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
}
}).when(packetSender).addPacketCallback(Mockito.any(Packet.class), Mockito.any(PacketCallback.class));
- ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
localResourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
- ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
remoteResourcesInfo.setId(DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
@@ -1569,6 +1579,7 @@ public void testPersistentRequestValidityPeriodInFuture() throws InterruptedExce
Assert.assertNull(requests.get(0).getProvidingMemberId());
}
+ @SuppressWarnings("unchecked")
@Test
public void testSubmitRequestForRemoteMemberValidation() {
ResourcesInfo resources = Mockito.mock(ResourcesInfo.class);
@@ -1809,9 +1820,9 @@ public void testGetFlavors() {
@Test
public void testGetAllowedFederationMembers() {
- ResourcesInfo resourcesInfoOne = new ResourcesInfo("id1","", "", "", "", null);
- ResourcesInfo resourcesInfoTwo = new ResourcesInfo("id2","", "", "", "", null);
- ResourcesInfo resourcesInfoThree = new ResourcesInfo("id3","", "", "", "", null);
+ ResourcesInfo resourcesInfoOne = new ResourcesInfo("id1","", "", "", "", "", "");
+ ResourcesInfo resourcesInfoTwo = new ResourcesInfo("id2","", "", "", "", "", "");
+ ResourcesInfo resourcesInfoThree = new ResourcesInfo("id3","", "", "", "", "", "");
List listMembers = new ArrayList();
listMembers.add(new FederationMember(resourcesInfoOne));
@@ -1826,9 +1837,9 @@ public void testGetAllowedFederationMembers() {
@Test
public void testGetAllowedFederationMembersWithRequirements() {
- ResourcesInfo resourcesInfoOne = new ResourcesInfo("id1","", "", "", "", null);
- ResourcesInfo resourcesInfoTwo = new ResourcesInfo("id2","", "", "", "", null);
- ResourcesInfo resourcesInfoThree = new ResourcesInfo("id3","", "", "", "", null);
+ ResourcesInfo resourcesInfoOne = new ResourcesInfo("id1","", "", "", "", "", "");
+ ResourcesInfo resourcesInfoTwo = new ResourcesInfo("id2","", "", "", "", "", "");
+ ResourcesInfo resourcesInfoThree = new ResourcesInfo("id3","", "", "", "", "", "");
List listMembers = new ArrayList();
listMembers.add(new FederationMember(resourcesInfoOne));
@@ -1886,10 +1897,10 @@ public void testInstanceIsNotBeingUsedButRequestWasForwarded(){
AsyncPacketSender packetSender = Mockito.mock(AsyncPacketSender.class);
managerController.setPacketSender(packetSender);
- ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo localResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
localResourcesInfo.setId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
- ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", null);
+ ResourcesInfo remoteResourcesInfo = new ResourcesInfo("", "", "", "", "", "");
remoteResourcesInfo.setId(DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
@@ -2213,7 +2224,370 @@ public void testGarbageCollectorWithServedRequest() {
}
@Test
- public void testPreemption(){
+ @SuppressWarnings("unchecked")
+ public void testSSHKeyReplacementWhenOriginalRequestHasPublicKey()
+ throws FileNotFoundException, IOException, MessagingException {
+ Map extraProperties = new HashMap();
+ extraProperties.put(ConfigurationConstants.SSH_PUBLIC_KEY_PATH,
+ DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH);
+ ManagerController localManagerController =
+ managerTestHelper.createDefaultManagerController(extraProperties);
+ ManagerController spiedManageController = Mockito.spy(localManagerController);
+ String remoteRequestId = "id1";
+
+ SshHelper sshHelper = createFakeSSHHelper();
+ Mockito.doReturn(sshHelper).when(spiedManageController).createSshHelper();
+
+ Map newXOCCIAttr = new HashMap(this.xOCCIAtt);
+ ArrayList categories = new ArrayList();
+ final Category publicKeyCategory = new Category(RequestConstants.PUBLIC_KEY_TERM,
+ RequestConstants.CREDENTIALS_RESOURCE_SCHEME, RequestConstants.MIXIN_CLASS);
+ categories.add(publicKeyCategory);
+ newXOCCIAttr.put(RequestAttribute.DATA_PUBLIC_KEY.getValue(), "public-key");
+
+ ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
+ String newInstanceId = "newinstanceid";
+ Mockito.when(
+ computePlugin.requestInstance(Mockito.any(Token.class),
+ Mockito.anyList(), Mockito.anyMap(), Mockito.anyString())).thenReturn(newInstanceId);
+ spiedManageController.setComputePlugin(computePlugin);
+
+ Request servedRequest = new Request(remoteRequestId, managerTestHelper.getDefaultFederationToken(),
+ managerTestHelper.getDefaultLocalToken(), categories,
+ newXOCCIAttr, true,
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
+ servedRequest.setState(RequestState.FULFILLED);
+ servedRequest.setInstanceId(newInstanceId);
+ servedRequest.setProvidingMemberId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ Instance instance = new Instance(newInstanceId);
+ instance.addAttribute(Instance.SSH_PUBLIC_ADDRESS_ATT, "127.0.0.1:5555");
+ instance.addAttribute(Instance.SSH_USERNAME_ATT, "fogbow");
+
+ Mockito.when(computePlugin.getInstance(Mockito.any(Token.class),
+ Mockito.eq(newInstanceId))).thenReturn(instance);
+
+ spiedManageController.createInstanceWithFederationUser(servedRequest);
+
+ final String localManagerPublicKeyData = IOUtils.toString(new FileInputStream(
+ new File(DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH)));
+
+ Mockito.verify(computePlugin).requestInstance(Mockito.any(Token.class),
+ Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ List categories = (List) argument;
+ return !categories.contains(publicKeyCategory);
+ }
+ }), Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ Map xOCCIAttr = (Map) argument;
+ String publicKeyValue = xOCCIAttr
+ .get(RequestAttribute.DATA_PUBLIC_KEY
+ .getValue());
+ return publicKeyValue == null;
+ }
+ }), Mockito.anyString());
+
+ String base64UserDataCmd = new String(Base64.decodeBase64(localManagerController
+ .createUserDataUtilsCommand(servedRequest)), "UTF-8");
+ Assert.assertTrue(base64UserDataCmd.contains(localManagerPublicKeyData));
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void testSSHKeyReplacementWhenOriginalRequestHasNoPublicKey()
+ throws FileNotFoundException, IOException, MessagingException {
+ Map extraProperties = new HashMap();
+ extraProperties.put(ConfigurationConstants.SSH_PUBLIC_KEY_PATH,
+ DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH);
+ ManagerController localManagerController =
+ managerTestHelper.createDefaultManagerController(extraProperties);
+ String remoteRequestId = "id1";
+ ManagerController spiedManageController = Mockito.spy(localManagerController);
+
+ SshHelper sshHelper = createFakeSSHHelper();
+ Mockito.doReturn(sshHelper).when(spiedManageController).createSshHelper();
+
+ ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
+ String newInstanceId = "newinstanceid";
+ Mockito.when(
+ computePlugin.requestInstance(Mockito.any(Token.class),
+ Mockito.anyList(), Mockito.anyMap(), Mockito.anyString())).thenReturn(newInstanceId);
+ spiedManageController.setComputePlugin(computePlugin);
+
+ Request servedRequest = new Request(remoteRequestId, managerTestHelper.getDefaultFederationToken(),
+ managerTestHelper.getDefaultLocalToken(), new ArrayList(),
+ xOCCIAtt, true,
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
+ servedRequest.setState(RequestState.FULFILLED);
+ servedRequest.setInstanceId(newInstanceId);
+ servedRequest.setProvidingMemberId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ Instance instance = new Instance(newInstanceId);
+ instance.addAttribute(Instance.SSH_PUBLIC_ADDRESS_ATT, "127.0.0.1:5555");
+ instance.addAttribute(Instance.SSH_USERNAME_ATT, "fogbow");
+
+ Mockito.when(computePlugin.getInstance(Mockito.any(Token.class),
+ Mockito.eq(newInstanceId))).thenReturn(instance);
+
+ spiedManageController.createInstanceWithFederationUser(servedRequest);
+
+ final String localManagerPublicKeyData = IOUtils.toString(new FileInputStream(
+ new File(DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH)));
+
+ final Category publicKeyCategory = new Category(RequestConstants.PUBLIC_KEY_TERM,
+ RequestConstants.CREDENTIALS_RESOURCE_SCHEME, RequestConstants.MIXIN_CLASS);
+
+ Mockito.verify(computePlugin).requestInstance(Mockito.any(Token.class),
+ Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ List categories = (List) argument;
+ return !categories.contains(publicKeyCategory);
+ }
+ }), Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ Map xOCCIAttr = (Map) argument;
+ String publicKeyValue = xOCCIAttr
+ .get(RequestAttribute.DATA_PUBLIC_KEY
+ .getValue());
+ return publicKeyValue == null;
+ }
+ }), Mockito.anyString());
+
+ String base64UserDataCmd = new String(Base64.decodeBase64(localManagerController
+ .createUserDataUtilsCommand(servedRequest)), "UTF-8");
+ Assert.assertTrue(base64UserDataCmd.contains(localManagerPublicKeyData));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testSSHKeyReplacementWhenManagerKeyIsNotDefined()
+ throws FileNotFoundException, IOException, MessagingException {
+ ManagerController managerControllerSpy = Mockito.spy(managerController);
+
+ ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
+ String instanceId = "instance1";
+ Mockito.when(
+ computePlugin.requestInstance(Mockito.any(Token.class), Mockito.anyList(),
+ Mockito.anyMap(), Mockito.anyString())).thenReturn(instanceId);
+ managerControllerSpy.setComputePlugin(computePlugin);
+
+ String servedRequestId = "id1";
+ Request servedRequest = new Request(servedRequestId, managerTestHelper.getDefaultFederationToken(),
+ managerTestHelper.getDefaultLocalToken(), new ArrayList(),
+ xOCCIAtt, true,
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL);
+ servedRequest.setState(RequestState.FULFILLED);
+ servedRequest.setInstanceId(instanceId);
+ servedRequest.setProvidingMemberId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ managerControllerSpy.createInstanceWithFederationUser(servedRequest);
+
+ Mockito.verify(managerControllerSpy, Mockito.never()).waitForSSHPublicAddress(Mockito.eq(servedRequest));
+
+ final String localManagerPublicKeyData = IOUtils.toString(new FileInputStream(
+ new File(DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH)));
+
+ String base64UserDataCmd = new String(Base64.decodeBase64(managerController
+ .createUserDataUtilsCommand(servedRequest)), "UTF-8");
+ Assert.assertFalse(base64UserDataCmd.contains(localManagerPublicKeyData));
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void testSSHKeyReplacementLocallyWhenOriginalRequestHasPublicKey() throws FileNotFoundException, IOException, MessagingException {
+ Map extraProperties = new HashMap();
+ extraProperties.put(ConfigurationConstants.SSH_PUBLIC_KEY_PATH,
+ DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH);
+ ManagerController localManagerController =
+ managerTestHelper.createDefaultManagerController(extraProperties);
+ ManagerController spiedManageController = Mockito.spy(localManagerController);
+
+ SshHelper sshHelper = createFakeSSHHelper();
+ Mockito.doReturn(sshHelper).when(spiedManageController).createSshHelper();
+
+ String localRequestId = "id1";
+
+ Map newXOCCIAttr = new HashMap(this.xOCCIAtt);
+ ArrayList categories = new ArrayList();
+ final Category publicKeyCategory = new Category(RequestConstants.PUBLIC_KEY_TERM,
+ RequestConstants.CREDENTIALS_RESOURCE_SCHEME, RequestConstants.MIXIN_CLASS);
+ categories.add(publicKeyCategory);
+ newXOCCIAttr.put(RequestAttribute.DATA_PUBLIC_KEY.getValue(), "public-key");
+
+ ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
+ String newInstanceId = "newinstanceid";
+ Mockito.when(
+ computePlugin.requestInstance(Mockito.any(Token.class),
+ Mockito.anyList(), Mockito.anyMap(), Mockito.anyString())).thenReturn(newInstanceId);
+ spiedManageController.setComputePlugin(computePlugin);
+
+ Request localRequest = new Request(localRequestId, managerTestHelper.getDefaultFederationToken(),
+ managerTestHelper.getDefaultLocalToken(), categories,
+ newXOCCIAttr, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+ localRequest.setState(RequestState.FULFILLED);
+ localRequest.setInstanceId(newInstanceId);
+ localRequest.setProvidingMemberId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ Instance instance = new Instance(newInstanceId);
+ instance.addAttribute(Instance.SSH_PUBLIC_ADDRESS_ATT, "127.0.0.1:5555");
+ instance.addAttribute(Instance.SSH_USERNAME_ATT, "fogbow");
+
+ Mockito.when(computePlugin.getInstance(Mockito.any(Token.class),
+ Mockito.eq(newInstanceId))).thenReturn(instance);
+
+ spiedManageController.createInstanceWithFederationUser(localRequest);
+
+ final String localManagerPublicKeyData = IOUtils.toString(new FileInputStream(
+ new File(DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH)));
+
+ Mockito.verify(computePlugin).requestInstance(Mockito.any(Token.class),
+ Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ List categories = (List) argument;
+ return !categories.contains(publicKeyCategory);
+ }
+ }), Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ Map xOCCIAttr = (Map) argument;
+ String publicKeyValue = xOCCIAttr
+ .get(RequestAttribute.DATA_PUBLIC_KEY
+ .getValue());
+ return publicKeyValue == null;
+ }
+ }), Mockito.anyString());
+
+ String base64UserDataCmd = new String(Base64.decodeBase64(localManagerController
+ .createUserDataUtilsCommand(localRequest)), "UTF-8");
+ Assert.assertTrue(base64UserDataCmd.contains(localManagerPublicKeyData));
+ }
+
+ private SshHelper createFakeSSHHelper() throws IOException {
+ SshHelper sshHelper = Mockito.mock(SshHelper.class);
+ Command command = Mockito.mock(Command.class);
+ Mockito.when(command.getExitStatus()).thenReturn(0);
+ Mockito.when(sshHelper.doSshExecution(Mockito.anyString())).thenReturn(command);
+ return sshHelper;
+ }
+
+ @Test
+ @SuppressWarnings("unchecked")
+ public void testSSHKeyReplacementLocallyWhenOriginalRequestHasNoPublicKey()
+ throws FileNotFoundException, IOException, MessagingException {
+ Map extraProperties = new HashMap();
+ extraProperties.put(ConfigurationConstants.SSH_PUBLIC_KEY_PATH,
+ DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH);
+ ManagerController localManagerController =
+ managerTestHelper.createDefaultManagerController(extraProperties);
+ String localRequestId = "id1";
+ ManagerController spiedManageController = Mockito.spy(localManagerController);
+
+ SshHelper sshHelper = createFakeSSHHelper();
+ Mockito.doReturn(sshHelper).when(spiedManageController).createSshHelper();
+
+ ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
+ String newInstanceId = "newinstanceid";
+ Mockito.when(
+ computePlugin.requestInstance(Mockito.any(Token.class),
+ Mockito.anyList(), Mockito.anyMap(), Mockito.anyString())).thenReturn(newInstanceId);
+ spiedManageController.setComputePlugin(computePlugin);
+
+ Request localRequest = new Request(localRequestId, managerTestHelper.getDefaultFederationToken(),
+ managerTestHelper.getDefaultLocalToken(), new ArrayList(),
+ xOCCIAtt, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+ localRequest.setState(RequestState.FULFILLED);
+ localRequest.setInstanceId(newInstanceId);
+ localRequest.setProvidingMemberId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ Instance instance = new Instance(newInstanceId);
+ instance.addAttribute(Instance.SSH_PUBLIC_ADDRESS_ATT, "127.0.0.1:5555");
+ instance.addAttribute(Instance.SSH_USERNAME_ATT, "fogbow");
+
+ Mockito.when(computePlugin.getInstance(Mockito.any(Token.class),
+ Mockito.eq(newInstanceId))).thenReturn(instance);
+
+ spiedManageController.createInstanceWithFederationUser(localRequest);
+
+ final String localManagerPublicKeyData = IOUtils.toString(new FileInputStream(
+ new File(DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH)));
+
+ final Category publicKeyCategory = new Category(RequestConstants.PUBLIC_KEY_TERM,
+ RequestConstants.CREDENTIALS_RESOURCE_SCHEME, RequestConstants.MIXIN_CLASS);
+
+ Mockito.verify(computePlugin).requestInstance(Mockito.any(Token.class),
+ Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ List categories = (List) argument;
+ return !categories.contains(publicKeyCategory);
+ }
+ }), Mockito.argThat(new ArgumentMatcher>() {
+
+ @Override
+ public boolean matches(Object argument) {
+ Map xOCCIAttr = (Map) argument;
+ String publicKeyValue = xOCCIAttr
+ .get(RequestAttribute.DATA_PUBLIC_KEY
+ .getValue());
+ return publicKeyValue == null;
+ }
+ }), Mockito.anyString());
+
+ String base64UserDataCmd = new String(Base64.decodeBase64(localManagerController
+ .createUserDataUtilsCommand(localRequest)), "UTF-8");
+ Assert.assertTrue(base64UserDataCmd.contains(localManagerPublicKeyData));
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testSSHKeyReplacementLocallyWhenManagerKeyIsNotDefined()
+ throws FileNotFoundException, IOException, MessagingException {
+ ManagerController managerControllerSpy = Mockito.spy(managerController);
+
+ ComputePlugin computePlugin = Mockito.mock(ComputePlugin.class);
+ String instanceId = "instance1";
+ Mockito.when(
+ computePlugin.requestInstance(Mockito.any(Token.class), Mockito.anyList(),
+ Mockito.anyMap(), Mockito.anyString())).thenReturn(instanceId);
+ managerControllerSpy.setComputePlugin(computePlugin);
+
+ String localRequestId = "id1";
+ Request localRequest = new Request(localRequestId, managerTestHelper.getDefaultFederationToken(),
+ managerTestHelper.getDefaultLocalToken(), new ArrayList(),
+ xOCCIAtt, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+ localRequest.setState(RequestState.FULFILLED);
+ localRequest.setInstanceId(instanceId);
+ localRequest.setProvidingMemberId(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ managerControllerSpy.createInstanceWithFederationUser(localRequest);
+
+ Mockito.verify(managerControllerSpy, Mockito.never()).waitForSSHPublicAddress(Mockito.eq(localRequest));
+
+ final String localManagerPublicKeyData = IOUtils.toString(new FileInputStream(
+ new File(DefaultDataTestHelper.LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH)));
+
+ String base64UserDataCmd = new String(Base64.decodeBase64(managerController
+ .createUserDataUtilsCommand(localRequest)), "UTF-8");
+ Assert.assertFalse(base64UserDataCmd.contains(localManagerPublicKeyData));
+ }
+
+ public void testPreemption() {
Request localRequest = new Request("id1", managerTestHelper.getDefaultFederationToken(),
managerTestHelper.getDefaultLocalToken(), new ArrayList(),
new HashMap(), true,
@@ -2278,5 +2652,6 @@ public void testPreemption(){
Assert.assertTrue(requestRepository.getAllRemoteRequests().isEmpty());
Assert.assertFalse(requestRepository.getAllRemoteRequests().contains(servedRequest1));
Assert.assertFalse(requestRepository.getAllRemoteRequests().contains(servedRequest2));
- }
+ }
+
}
diff --git a/src/test/java/org/fogbowcloud/manager/core/TestNoFMemberPicker.java b/src/test/java/org/fogbowcloud/manager/core/TestNoFMemberPicker.java
index 285992ba..351cf9cb 100644
--- a/src/test/java/org/fogbowcloud/manager/core/TestNoFMemberPicker.java
+++ b/src/test/java/org/fogbowcloud/manager/core/TestNoFMemberPicker.java
@@ -48,7 +48,7 @@ public void testEmptyMembers() {
public void testOnlyLocalMember() {
// mocking
FederationMember localMember = new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", null));
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", "", ""));
ArrayList membersToReturn = new ArrayList();
membersToReturn.add(localMember);
@@ -65,9 +65,9 @@ public void testOnlyLocalMember() {
public void testOneRemoteMember() {
// mocking facade
FederationMember localMember = new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", null));
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", "", ""));
FederationMember remoteMember = new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL, "", "", "", "", null));
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL, "", "", "", "", "", ""));
ArrayList membersToReturn = new ArrayList();
membersToReturn.add(localMember);
membersToReturn.add(remoteMember);
@@ -91,11 +91,11 @@ public void testOneRemoteMember() {
public void testTwoRemoteMembers() {
// mocking facade
FederationMember localMember = new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", null));
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", "", ""));
FederationMember remoteMember1 = new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL + "1", "", "", "", "", null));
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL + "1", "", "", "", "", "", ""));
FederationMember remoteMember2 = new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL + "2", "", "", "", "", null));
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL + "2", "", "", "", "", "", ""));
ArrayList membersToReturn = new ArrayList();
membersToReturn.add(localMember);
membersToReturn.add(remoteMember1);
diff --git a/src/test/java/org/fogbowcloud/manager/core/TestRoundRobinMemberPicker.java b/src/test/java/org/fogbowcloud/manager/core/TestRoundRobinMemberPicker.java
index 8b524073..0984ac60 100644
--- a/src/test/java/org/fogbowcloud/manager/core/TestRoundRobinMemberPicker.java
+++ b/src/test/java/org/fogbowcloud/manager/core/TestRoundRobinMemberPicker.java
@@ -21,11 +21,11 @@ public void testListMembersNull() {
public void testPick() {
RoundRobinMemberPicker roundRobinMemberPicker = new RoundRobinMemberPicker(null, null);
List members = new ArrayList();
- ResourcesInfo resourcesInfoD = new ResourcesInfo("d", "", "", "", "", null);
- ResourcesInfo resourcesInfoA = new ResourcesInfo("a", "", "", "", "", null);
- ResourcesInfo resourcesInfoCA = new ResourcesInfo("ca", "", "", "", "", null);
- ResourcesInfo resourcesInfoCB = new ResourcesInfo("cb", "", "", "", "", null);
- ResourcesInfo resourcesInfoB = new ResourcesInfo("b", "", "", "", "", null);
+ ResourcesInfo resourcesInfoD = new ResourcesInfo("d", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoA = new ResourcesInfo("a", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoCA = new ResourcesInfo("ca", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoCB = new ResourcesInfo("cb", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoB = new ResourcesInfo("b", "", "", "", "", "", "");
members.add(new FederationMember(resourcesInfoA));
members.add(new FederationMember(resourcesInfoCB));
members.add(new FederationMember(resourcesInfoCA));
@@ -72,11 +72,11 @@ public void testPick() {
public void testPickListMemberWithoutLastMember() {
RoundRobinMemberPicker roundRobinMemberPicker = new RoundRobinMemberPicker(null, null);
List members = new ArrayList();
- ResourcesInfo resourcesInfoD = new ResourcesInfo("d", "", "", "", "", null);
- ResourcesInfo resourcesInfoA = new ResourcesInfo("a", "", "", "", "", null);
- ResourcesInfo resourcesInfoCA = new ResourcesInfo("ca", "", "", "", "", null);
- ResourcesInfo resourcesInfoCB = new ResourcesInfo("cb", "", "", "", "", null);
- ResourcesInfo resourcesInfoB = new ResourcesInfo("b", "", "", "", "", null);
+ ResourcesInfo resourcesInfoD = new ResourcesInfo("d", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoA = new ResourcesInfo("a", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoCA = new ResourcesInfo("ca", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoCB = new ResourcesInfo("cb", "", "", "", "", "", "");
+ ResourcesInfo resourcesInfoB = new ResourcesInfo("b", "", "", "", "", "", "");
members.add(new FederationMember(resourcesInfoA));
members.add(new FederationMember(resourcesInfoCB));
members.add(new FederationMember(resourcesInfoCA));
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/accounting/TestFCUAccounting.java b/src/test/java/org/fogbowcloud/manager/core/plugins/accounting/TestFCUAccounting.java
index 6b1e2325..3e9514ac 100644
--- a/src/test/java/org/fogbowcloud/manager/core/plugins/accounting/TestFCUAccounting.java
+++ b/src/test/java/org/fogbowcloud/manager/core/plugins/accounting/TestFCUAccounting.java
@@ -1,13 +1,11 @@
package org.fogbowcloud.manager.core.plugins.accounting;
-import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Properties;
-import org.apache.commons.io.FileUtils;
import org.fogbowcloud.manager.core.ConfigurationConstants;
import org.fogbowcloud.manager.core.model.DateUtils;
import org.fogbowcloud.manager.core.plugins.BenchmarkingPlugin;
@@ -24,17 +22,14 @@ public class TestFCUAccounting {
private static final double ACCEPTABLE_ERROR = 0.0;
private BenchmarkingPlugin benchmarkingPlugin;
- private final String DATASTORE_PATH = "src/test/resources/accounting";
FCUAccountingPlugin accountingPlugin;
Properties properties;
@Before
public void setUp() throws IOException {
- new File(DATASTORE_PATH).mkdir();
benchmarkingPlugin = Mockito.mock(BenchmarkingPlugin.class);
properties = new Properties();
- properties.put("accounting_datastore_url", "jdbc:h2:mem:"
- + new File(DATASTORE_PATH).getAbsolutePath() + "usage");
+ properties.put("accounting_datastore_url", "jdbc:h2:mem:usage");
properties.put(ConfigurationConstants.XMPP_JID_KEY, "localMemberId");
accountingPlugin = new FCUAccountingPlugin(properties, benchmarkingPlugin);
@@ -43,7 +38,6 @@ public void setUp() throws IOException {
@After
public void tearDown() throws IOException {
- FileUtils.cleanDirectory(new File(DATASTORE_PATH));
accountingPlugin.getDatabase().dispose();
}
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/benchmarking/TestFCUStaticBenchmarking.java b/src/test/java/org/fogbowcloud/manager/core/plugins/benchmarking/TestVanillaBenchmarking.java
similarity index 95%
rename from src/test/java/org/fogbowcloud/manager/core/plugins/benchmarking/TestFCUStaticBenchmarking.java
rename to src/test/java/org/fogbowcloud/manager/core/plugins/benchmarking/TestVanillaBenchmarking.java
index efb2330a..10cf6e90 100644
--- a/src/test/java/org/fogbowcloud/manager/core/plugins/benchmarking/TestFCUStaticBenchmarking.java
+++ b/src/test/java/org/fogbowcloud/manager/core/plugins/benchmarking/TestVanillaBenchmarking.java
@@ -5,7 +5,7 @@
import java.util.Map;
import org.fogbowcloud.manager.core.plugins.BenchmarkingPlugin;
-import org.fogbowcloud.manager.core.plugins.benchmarking.FCUStaticBenchmarkingPlugin;
+import org.fogbowcloud.manager.core.plugins.benchmarking.VanillaBenchmarkingPlugin;
import org.fogbowcloud.manager.occi.core.Resource;
import org.fogbowcloud.manager.occi.instance.Instance;
import org.fogbowcloud.manager.occi.instance.Instance.Link;
@@ -14,18 +14,18 @@
import org.junit.Before;
import org.junit.Test;
-public class TestFCUStaticBenchmarking {
+public class TestVanillaBenchmarking {
private static final double ACCEPTABLE_ERROR = 0.00;
Map instanceAttributes;
- FCUStaticBenchmarkingPlugin benchmarking;
+ VanillaBenchmarkingPlugin benchmarking;
@Before
public void setUp(){
instanceAttributes = new HashMap();
instanceAttributes.put("occi.compute.memory", "2");
instanceAttributes.put("occi.compute.cores", "2");
- benchmarking = new FCUStaticBenchmarkingPlugin(null);
+ benchmarking = new VanillaBenchmarkingPlugin(null);
}
@Test
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/imagestorage/vmcatcher/TestVMCatcherStoragePluginTest.java b/src/test/java/org/fogbowcloud/manager/core/plugins/imagestorage/vmcatcher/TestVMCatcherStoragePluginTest.java
new file mode 100644
index 00000000..ad6c4006
--- /dev/null
+++ b/src/test/java/org/fogbowcloud/manager/core/plugins/imagestorage/vmcatcher/TestVMCatcherStoragePluginTest.java
@@ -0,0 +1,111 @@
+package org.fogbowcloud.manager.core.plugins.imagestorage.vmcatcher;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+import java.util.concurrent.ExecutorService;
+
+import org.fogbowcloud.manager.core.CurrentThreadExecutorService;
+import org.fogbowcloud.manager.core.plugins.ComputePlugin;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class TestVMCatcherStoragePluginTest {
+
+ private static final String IMAGE_LIST_URL = "file://" + new File("").getAbsolutePath() +
+ "/src/test/resources/imagestorage/vmcatcher/image.list";
+ private ExecutorService downloader;
+ private ComputePlugin computePlugin;
+ private ShellWrapper shellWrapper;
+ private Properties properties;
+ private VMCatcherStoragePlugin plugin;
+
+ @Before
+ public void setup() {
+ this.downloader = Mockito.mock(ExecutorService.class);
+ this.computePlugin = Mockito.mock(ComputePlugin.class);
+ this.shellWrapper = Mockito.mock(ShellWrapper.class);
+ this.properties = new Properties();
+ this.plugin = new VMCatcherStoragePlugin(properties,
+ computePlugin, downloader, shellWrapper);
+ }
+
+ @Test
+ public void testImageListWithMalformedURL() {
+ Assert.assertNull(plugin.getLocalId(null, "non-url"));
+ Mockito.verifyZeroInteractions(downloader);
+ }
+
+ @Test
+ public void testImageListWithNotFoundURL() {
+ Assert.assertNull(plugin.getLocalId(null, "file://path/does/not/exist"));
+ Mockito.verifyZeroInteractions(downloader);
+ }
+
+ @Test
+ public void testImageWithValidURLWithNoIdentifierCesga() {
+ properties.put(VMCatcherStoragePlugin.PROP_VMC_PUSH_METHOD, "cesga");
+ Assert.assertNull(plugin.getLocalId(null, "file://" + new File("").getAbsolutePath() +
+ "/src/test/resources/imagestorage/vmcatcher/image.list.noidentifier"));
+ Mockito.verifyZeroInteractions(downloader);
+ }
+
+ @Test
+ public void testImageWithValidURLWithNoIdentifierGlance() {
+ properties.put(VMCatcherStoragePlugin.PROP_VMC_PUSH_METHOD, "glancepush");
+ Assert.assertNull(plugin.getLocalId(null, "file://" + new File("").getAbsolutePath() +
+ "/src/test/resources/imagestorage/vmcatcher/image.list.notitle"));
+ Mockito.verifyZeroInteractions(downloader);
+ }
+
+ @Test
+ public void testImageWithValidURLWithProperIdentifierCesga() throws IOException, InterruptedException {
+ properties.put(VMCatcherStoragePlugin.PROP_VMC_PUSH_METHOD, "cesga");
+ Assert.assertNull(plugin.getLocalId(null, IMAGE_LIST_URL));
+ Mockito.verify(computePlugin).getImageId(null, "776690f9-d023-44c6-9923-b66ed853d77b");
+ Mockito.verify(shellWrapper).execute("sudo", "vmcatcher_subscribe",
+ "--imagelist-newimage-subscribe", "--auto-endorse", "-s", IMAGE_LIST_URL);
+ Mockito.verify(downloader).execute(Mockito.any(Runnable.class));
+ }
+
+ @Test
+ public void testImageWithValidURLWithProperIdentifierGlance() throws IOException, InterruptedException {
+ properties.put(VMCatcherStoragePlugin.PROP_VMC_PUSH_METHOD, "glancepush");
+ Assert.assertNull(plugin.getLocalId(null, IMAGE_LIST_URL));
+ Mockito.verify(computePlugin).getImageId(null, "Scientific_Linux_6.5_Minimal");
+ Mockito.verify(shellWrapper).execute("sudo", "vmcatcher_subscribe",
+ "--imagelist-newimage-subscribe", "--auto-endorse", "-s", IMAGE_LIST_URL);
+ Mockito.verify(downloader).execute(Mockito.any(Runnable.class));
+ }
+
+ @Test
+ public void testImageWithValidURLWithProperIdentifierCesgaSameThread() throws IOException, InterruptedException {
+ setupInSameThread();
+ properties.put(VMCatcherStoragePlugin.PROP_VMC_PUSH_METHOD, "cesga");
+ Assert.assertNull(plugin.getLocalId(null, IMAGE_LIST_URL));
+ Mockito.verify(shellWrapper).execute("sudo", "vmcatcher_subscribe", "-U");
+ Mockito.verify(shellWrapper).execute("sudo", "vmcatcher_cache");
+ }
+
+ @Test
+ public void testImageWithValidURLWithProperIdentifierGlanceSameThread() throws IOException, InterruptedException {
+ setupInSameThread();
+ properties.put(VMCatcherStoragePlugin.PROP_VMC_PUSH_METHOD, "glancepush");
+ Assert.assertNull(plugin.getLocalId(null, IMAGE_LIST_URL));
+ Mockito.verify(shellWrapper).execute("sudo", "vmcatcher_subscribe", "-U");
+ Mockito.verify(shellWrapper).execute("sudo", "vmcatcher_cache");
+ }
+
+ private void setupInSameThread() {
+ CurrentThreadExecutorService executor = new CurrentThreadExecutorService();
+ this.downloader = Mockito.mock(ExecutorService.class);
+ this.computePlugin = Mockito.mock(ComputePlugin.class);
+ this.shellWrapper = Mockito.mock(ShellWrapper.class);
+ this.properties = new Properties();
+ this.plugin = new VMCatcherStoragePlugin(properties,
+ computePlugin, executor, shellWrapper);
+ }
+
+}
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/TestPrioritizeRemotePlugin.java b/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/TestPrioritizeRemotePlugin.java
new file mode 100644
index 00000000..1c71357a
--- /dev/null
+++ b/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/TestPrioritizeRemotePlugin.java
@@ -0,0 +1,198 @@
+package org.fogbowcloud.manager.core.plugins.prioritization;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+
+import org.fogbowcloud.manager.core.ConfigurationConstants;
+import org.fogbowcloud.manager.core.model.DateUtils;
+import org.fogbowcloud.manager.core.plugins.AccountingPlugin;
+import org.fogbowcloud.manager.core.util.DefaultDataTestHelper;
+import org.fogbowcloud.manager.occi.core.Token;
+import org.fogbowcloud.manager.occi.request.Request;
+import org.fogbowcloud.manager.occi.request.RequestState;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class TestPrioritizeRemotePlugin {
+
+ private Properties properties;
+ private AccountingPlugin accountingPlugin;
+
+ @Before
+ public void setUp(){
+ properties = new Properties();
+ properties.put(ConfigurationConstants.XMPP_JID_KEY,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ accountingPlugin = Mockito.mock(AccountingPlugin.class);
+ }
+
+ @Test
+ public void testTakeNullForLocalRequest() {
+ PriotizeRemoteRequestPlugin plugin = new PriotizeRemoteRequestPlugin(properties, accountingPlugin);
+
+ // mocking dateUtils
+ long now = System.currentTimeMillis();
+ DateUtils dateUtils = Mockito.mock(DateUtils.class);
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request servedRequest1 = new Request("id1", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest1.setInstanceId("instanceId1");
+ servedRequest1.setState(RequestState.FULFILLED);
+ servedRequest1.setFulfilledByFederationUser(true);
+ servedRequest1.setProvidingMemberId("localMemberId");
+
+ // mocking dateUtils
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now + 30);
+
+ Request servedRequest2 = new Request("id2", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest2.setInstanceId("instanceId2");
+ servedRequest2.setState(RequestState.FULFILLED);
+ servedRequest2.setFulfilledByFederationUser(true);
+ servedRequest2.setProvidingMemberId("localMemberId");
+
+ List requests = new ArrayList();
+ requests.add(servedRequest1);
+ requests.add(servedRequest2);
+
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, dateUtils);
+
+ Assert.assertNull(plugin.takeFrom(newRequest, requests));
+ }
+
+ @Test
+ public void testTakeMostRecentServedRequest() {
+ PriotizeRemoteRequestPlugin plugin = new PriotizeRemoteRequestPlugin(properties, accountingPlugin);
+
+ // mocking dateUtils
+ long now = System.currentTimeMillis();
+ DateUtils dateUtils = Mockito.mock(DateUtils.class);
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request servedRequest1 = new Request("id1", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest1.setInstanceId("instanceId1");
+ servedRequest1.setState(RequestState.FULFILLED);
+ servedRequest1.setFulfilledByFederationUser(true);
+ servedRequest1.setProvidingMemberId("localMemberId");
+
+ // mocking dateUtils
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now + 30);
+
+ Request servedRequest2 = new Request("id2", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest2.setInstanceId("instanceId2");
+ servedRequest2.setState(RequestState.FULFILLED);
+ servedRequest2.setFulfilledByFederationUser(true);
+ servedRequest2.setProvidingMemberId("localMemberId");
+
+ List requests = new ArrayList();
+ requests.add(servedRequest1);
+ requests.add(servedRequest2);
+
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2", dateUtils);
+
+ // checking if take from most recent request
+ Assert.assertEquals(servedRequest2, plugin.takeFrom(newRequest, requests));
+ }
+
+ @Test
+ public void testTakeMostRecentLocalRequest() {
+ PriotizeRemoteRequestPlugin plugin = new PriotizeRemoteRequestPlugin(properties, accountingPlugin);
+
+ // mocking dateUtils
+ long now = System.currentTimeMillis();
+ DateUtils dateUtils = Mockito.mock(DateUtils.class);
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request request1 = new Request("id1", new Token("accessId", "localUserId", null,
+ new HashMap()), null, null, null, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, dateUtils);
+ request1.setInstanceId("instanceId1");
+ request1.setState(RequestState.FULFILLED);
+ request1.setFulfilledByFederationUser(true);
+ request1.setProvidingMemberId("localMemberId");
+
+ // mocking dateUtils
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now + 30);
+
+ Request request2 = new Request("id2", new Token("accessId", "localUserId", null,
+ new HashMap()), null, null, null, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, dateUtils);
+ request2.setInstanceId("instanceId2");
+ request2.setState(RequestState.FULFILLED);
+ request2.setFulfilledByFederationUser(true);
+ request2.setProvidingMemberId("localMemberId");
+
+ List requests = new ArrayList();
+ requests.add(request1);
+ requests.add(request2);
+
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2", dateUtils);
+
+ // checking if take from most recent request
+ Assert.assertEquals(request2, plugin.takeFrom(newRequest, requests));
+ }
+
+ @Test
+ public void testTakeMostRecentAccrossLocalAndServedRequest() {
+ PriotizeRemoteRequestPlugin plugin = new PriotizeRemoteRequestPlugin(properties, accountingPlugin);
+
+ // mocking dateUtils
+ long now = System.currentTimeMillis();
+ DateUtils dateUtils = Mockito.mock(DateUtils.class);
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request servedRequest1 = new Request("id1", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest1.setInstanceId("instanceId1");
+ servedRequest1.setState(RequestState.FULFILLED);
+ servedRequest1.setFulfilledByFederationUser(true);
+ servedRequest1.setProvidingMemberId("localMemberId");
+
+ // mocking dateUtils
+ now += 30;
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request request2 = new Request("id2", new Token("accessId", "localUserId", null,
+ new HashMap()), null, null, null, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, dateUtils);
+ request2.setInstanceId("instanceId2");
+ request2.setState(RequestState.FULFILLED);
+ request2.setFulfilledByFederationUser(true);
+ request2.setProvidingMemberId("localMemberId");
+
+ // mocking dateUtils
+ now += 30;
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request request3 = new Request("id3", new Token("accessId", "localUserId", null,
+ new HashMap()), null, null, null, true,
+ DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL, dateUtils);
+ request3.setInstanceId("instanceId3");
+ request3.setState(RequestState.FULFILLED);
+ request3.setFulfilledByFederationUser(true);
+ request3.setProvidingMemberId("localMemberId");
+
+ List requests = new ArrayList();
+ requests.add(servedRequest1);
+ requests.add(request2);
+ requests.add(request3);
+
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2", dateUtils);
+
+ // checking if take from most recent request
+ Assert.assertEquals(request3, plugin.takeFrom(newRequest, requests));
+ }
+}
diff --git a/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/nof/TestNoFPrioritizationPlugin.java b/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/nof/TestNoFPrioritizationPlugin.java
index 9bafa7cf..80bc9d6a 100644
--- a/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/nof/TestNoFPrioritizationPlugin.java
+++ b/src/test/java/org/fogbowcloud/manager/core/plugins/prioritization/nof/TestNoFPrioritizationPlugin.java
@@ -29,6 +29,7 @@ public void setUp(){
properties.put(ConfigurationConstants.XMPP_JID_KEY,
DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
properties.put("nof_trustworthy", "false");
+ properties.put("nof_prioritize_local", "true");
accountingPlugin = Mockito.mock(AccountingPlugin.class);
}
@@ -39,8 +40,11 @@ public void testServedRequestsNull() {
Mockito.when(accountingPlugin.getMembersUsage()).thenReturn(
new HashMap());
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "memberId");
+
NoFPrioritizationPlugin nofPlugin = new NoFPrioritizationPlugin(properties, accountingPlugin);
- Assert.assertNull(nofPlugin.takeFrom("memberId", null));
+ Assert.assertNull(nofPlugin.takeFrom(newRequest, null));
}
@Test
@@ -49,12 +53,15 @@ public void testEmptyServedRequests() {
Mockito.when(accountingPlugin.getMembersUsage()).thenReturn(
new HashMap());
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "memberId");
+
NoFPrioritizationPlugin nofPlugin = new NoFPrioritizationPlugin(properties, accountingPlugin);
- Assert.assertNull(nofPlugin.takeFrom("memberId", new ArrayList()));
+ Assert.assertNull(nofPlugin.takeFrom(newRequest, new ArrayList()));
}
-
+
@Test
- public void testNoServedRequest() {
+ public void testTakeFromOneServedRequest() {
//mocking accounting
HashMap membersUsage = new HashMap();
ResourceUsage member1Usage = new ResourceUsage("member1");
@@ -68,36 +75,31 @@ public void testNoServedRequest() {
membersUsage.put("member1", member1Usage);
membersUsage.put("member2", member2Usage);
Mockito.when(accountingPlugin.getMembersUsage()).thenReturn(
- membersUsage);
+ membersUsage);
NoFPrioritizationPlugin nofPlugin = new NoFPrioritizationPlugin(properties, accountingPlugin);
- Request localRequest1 = new Request("id1", new Token("accessId", "localUserId", null,
- new HashMap()), null, null, null, true, "localMemberId");
- localRequest1.setInstanceId("instanceId1");
- localRequest1.setState(RequestState.FULFILLED);
- localRequest1.setProvidingMemberId("localMemberId");
-
- Request localRequest2 = new Request("id2", new Token("accessId", "localUserId", null,
- new HashMap()), null, null, null, true, "localMemberId");
- localRequest2.setInstanceId("instanceId2");
- localRequest2.setState(RequestState.FULFILLED);
- localRequest2.setProvidingMemberId("localMemberId");
+ Request servedRequest = new Request("id", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1");
+ servedRequest.setInstanceId("instanceId");
+ servedRequest.setState(RequestState.FULFILLED);
+ servedRequest.setProvidingMemberId("localMemberId");
List requests = new ArrayList();
- requests.add(localRequest1);
- requests.add(localRequest2);
+ requests.add(servedRequest);
- // check if there is no instance to take from because there is no served request
- Assert.assertNull(nofPlugin.takeFrom("member2", requests));
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2");
+
+ Assert.assertEquals(servedRequest, nofPlugin.takeFrom(newRequest, requests));
}
@Test
- public void testTakeFromOneServedRequest() {
+ public void testNoTakeFromBecauseDebtIsTheSame() {
//mocking accounting
HashMap membersUsage = new HashMap();
ResourceUsage member1Usage = new ResourceUsage("member1");
- member1Usage.addConsumption(20);
+ member1Usage.addConsumption(30);
member1Usage.addDonation(10);
ResourceUsage member2Usage = new ResourceUsage("member2");
@@ -120,15 +122,18 @@ public void testTakeFromOneServedRequest() {
List requests = new ArrayList();
requests.add(servedRequest);
- Assert.assertEquals(servedRequest, nofPlugin.takeFrom("member2", requests));
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2");
+
+ Assert.assertNull(nofPlugin.takeFrom(newRequest, requests));
}
@Test
- public void testNoTakeFromBecauseDebtIsTheSame() {
+ public void testTakeFromMostRecentServedRequest() {
//mocking accounting
HashMap membersUsage = new HashMap();
ResourceUsage member1Usage = new ResourceUsage("member1");
- member1Usage.addConsumption(30);
+ member1Usage.addConsumption(20);
member1Usage.addDonation(10);
ResourceUsage member2Usage = new ResourceUsage("member2");
@@ -142,20 +147,39 @@ public void testNoTakeFromBecauseDebtIsTheSame() {
NoFPrioritizationPlugin nofPlugin = new NoFPrioritizationPlugin(properties, accountingPlugin);
- Request servedRequest = new Request("id", new Token("accessId", "remoteUserId", null,
- new HashMap()), null, null, null, false, "member1");
- servedRequest.setInstanceId("instanceId");
- servedRequest.setState(RequestState.FULFILLED);
- servedRequest.setProvidingMemberId("localMemberId");
+ // mocking dateUtils
+ long now = System.currentTimeMillis();
+ DateUtils dateUtils = Mockito.mock(DateUtils.class);
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now);
+
+ Request servedRequest1 = new Request("id1", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest1.setInstanceId("instanceId1");
+ servedRequest1.setState(RequestState.FULFILLED);
+ servedRequest1.setProvidingMemberId("localMemberId");
+
+ // mocking dateUtils
+ Mockito.when(dateUtils.currentTimeMillis()).thenReturn(now + 30);
+
+ Request servedRequest2 = new Request("id2", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1", dateUtils);
+ servedRequest2.setInstanceId("instanceId2");
+ servedRequest2.setState(RequestState.FULFILLED);
+ servedRequest2.setProvidingMemberId("localMemberId");
List requests = new ArrayList();
- requests.add(servedRequest);
+ requests.add(servedRequest1);
+ requests.add(servedRequest2);
+
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2");
- Assert.assertNull(nofPlugin.takeFrom("member2", requests));
+ // checking if take from most recent request
+ Assert.assertEquals(servedRequest2, nofPlugin.takeFrom(newRequest, requests));
}
@Test
- public void testTakeFromMostRecentServedRequest() {
+ public void testMoreThanOneTakeFromServedRequest() {
//mocking accounting
HashMap membersUsage = new HashMap();
ResourceUsage member1Usage = new ResourceUsage("member1");
@@ -197,12 +221,55 @@ public void testTakeFromMostRecentServedRequest() {
requests.add(servedRequest1);
requests.add(servedRequest2);
+ Request newRequest = new Request("newID", new Token("newAccessId", "newRemoteUserId", null,
+ new HashMap()), null, null, null, false, "member2");
+
// checking if take from most recent request
- Assert.assertEquals(servedRequest2, nofPlugin.takeFrom("member2", requests));
+ Assert.assertEquals(servedRequest2, nofPlugin.takeFrom(newRequest, requests));
+
+ requests.remove(servedRequest2);
+ Assert.assertEquals(servedRequest1, nofPlugin.takeFrom(newRequest, requests));
+
+ requests.remove(servedRequest1);
+ Assert.assertNull(nofPlugin.takeFrom(newRequest, requests));
}
@Test
- public void testMoreThanOneTakeFromServedRequest() {
+ public void testPrioritizeLocalRequest() {
+ //mocking accounting
+ HashMap membersUsage = new HashMap();
+ ResourceUsage member1Usage = new ResourceUsage("member1");
+ member1Usage.addConsumption(20);
+ member1Usage.addDonation(10);
+
+ ResourceUsage member2Usage = new ResourceUsage("member2");
+ member2Usage.addConsumption(30);
+ member2Usage.addDonation(10);
+
+ membersUsage.put("member1", member1Usage);
+ membersUsage.put("member2", member2Usage);
+ Mockito.when(accountingPlugin.getMembersUsage()).thenReturn(
+ membersUsage);
+
+ NoFPrioritizationPlugin nofPlugin = new NoFPrioritizationPlugin(properties, accountingPlugin);
+
+ Request servedRequest = new Request("id", new Token("accessId", "remoteUserId", null,
+ new HashMap()), null, null, null, false, "member1");
+ servedRequest.setInstanceId("instanceId");
+ servedRequest.setState(RequestState.FULFILLED);
+ servedRequest.setProvidingMemberId("localMemberId");
+
+ List requests = new ArrayList();
+ requests.add(servedRequest);
+
+ Request newRequest = new Request("newID", new Token("newAccessId", "newLocalUserId", null,
+ new HashMap()), null, null, null, true, DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
+ Assert.assertEquals(servedRequest, nofPlugin.takeFrom(newRequest, requests));
+ }
+
+ @Test
+ public void testPrioritizeLocalRequestWithThanOneServedRequest() {
//mocking accounting
HashMap membersUsage = new HashMap();
ResourceUsage member1Usage = new ResourceUsage("member1");
@@ -244,13 +311,16 @@ public void testMoreThanOneTakeFromServedRequest() {
requests.add(servedRequest1);
requests.add(servedRequest2);
+ Request newRequest = new Request("newID", new Token("newAccessId", "newLocalUserId", null,
+ new HashMap()), null, null, null, true, DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
+
// checking if take from most recent request
- Assert.assertEquals(servedRequest2, nofPlugin.takeFrom("member2", requests));
+ Assert.assertEquals(servedRequest2, nofPlugin.takeFrom(newRequest, requests));
requests.remove(servedRequest2);
- Assert.assertEquals(servedRequest1, nofPlugin.takeFrom("member2", requests));
+ Assert.assertEquals(servedRequest1, nofPlugin.takeFrom(newRequest, requests));
requests.remove(servedRequest1);
- Assert.assertNull(nofPlugin.takeFrom("member2", requests));
+ Assert.assertNull(nofPlugin.takeFrom(newRequest, requests));
}
}
diff --git a/src/test/java/org/fogbowcloud/manager/core/util/DefaultDataTestHelper.java b/src/test/java/org/fogbowcloud/manager/core/util/DefaultDataTestHelper.java
index a79ac82a..f62ac6b3 100644
--- a/src/test/java/org/fogbowcloud/manager/core/util/DefaultDataTestHelper.java
+++ b/src/test/java/org/fogbowcloud/manager/core/util/DefaultDataTestHelper.java
@@ -20,6 +20,7 @@ public class DefaultDataTestHelper {
//manager controller data
public static final String CONFIG_PATH = "src/test/resources/manager.conf.test";
+ public static final String LOCAL_MANAGER_SSH_PUBLIC_KEY_PATH = "src/test/resources/server.id_rsa.pub";
//time data
public static final Long SCHEDULER_PERIOD = 500L;
diff --git a/src/test/java/org/fogbowcloud/manager/core/util/ManagerTestHelper.java b/src/test/java/org/fogbowcloud/manager/core/util/ManagerTestHelper.java
index 462ec277..deed353a 100644
--- a/src/test/java/org/fogbowcloud/manager/core/util/ManagerTestHelper.java
+++ b/src/test/java/org/fogbowcloud/manager/core/util/ManagerTestHelper.java
@@ -7,9 +7,9 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
@@ -24,7 +24,6 @@
import org.fogbowcloud.manager.core.FederationMemberPicker;
import org.fogbowcloud.manager.core.ManagerController;
import org.fogbowcloud.manager.core.model.FederationMember;
-import org.fogbowcloud.manager.core.model.Flavor;
import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.core.plugins.AccountingPlugin;
import org.fogbowcloud.manager.core.plugins.AuthorizationPlugin;
@@ -83,11 +82,8 @@ public ManagerTestHelper() {
}
public ResourcesInfo getResources() throws CertificateException, IOException {
- List flavours = new LinkedList();
- flavours.add(new Flavor("small", "cpu", "mem", 2));
- flavours.add(new Flavor("small", "cpu", "mem", 3));
- ResourcesInfo resources = new ResourcesInfo("abc", "value1", "value2", "value3", "value4",
- flavours);
+ ResourcesInfo resources = new ResourcesInfo("abc", "cpu-idle", "cpu-in-use", "mem-idle",
+ "mem-in-use", "instances-idle", "instances-in-use");
return resources;
}
@@ -102,18 +98,14 @@ public IQ createWhoIsAliveResponse(ArrayList aliveIds, IQ iq)
statusEl.addElement("cpu-idle").setText(rendezvousItem.getResourcesInfo().getCpuIdle());
statusEl.addElement("cpu-inuse").setText(
rendezvousItem.getResourcesInfo().getCpuInUse());
- statusEl.addElement("mem-idle").setText(rendezvousItem.getResourcesInfo().getMemIdle());
+ statusEl.addElement("mem-idle").setText(
+ rendezvousItem.getResourcesInfo().getMemIdle());
statusEl.addElement("mem-inuse").setText(
rendezvousItem.getResourcesInfo().getMemInUse());
-
- List flavours = rendezvousItem.getResourcesInfo().getFlavors();
- for (Flavor f : flavours) {
- Element flavorElement = statusEl.addElement("flavor");
- flavorElement.addElement("name").setText(f.getName());
- flavorElement.addElement("cpu").setText(f.getCpu());
- flavorElement.addElement("mem").setText(f.getMem());
- flavorElement.addElement("capacity").setText(f.getCapacity().toString());
- }
+ statusEl.addElement("instances-idle").setText(
+ rendezvousItem.getResourcesInfo().getInstancesIdle());
+ statusEl.addElement("instances-inuse").setText(
+ rendezvousItem.getResourcesInfo().getInstancesInUse());
statusEl.addElement("cert");
statusEl.addElement("updated").setText(
String.valueOf(rendezvousItem.getFormattedTime()));
@@ -194,9 +186,9 @@ public ManagerXmppComponent initializeXMPPManagerComponent(boolean init) throws
properties.put(ConfigurationConstants.FEDERATION_USER_PASS_KEY, "fogbow");
properties.put(ConfigurationConstants.FEDERATION_USER_TENANT_NAME_KEY, "fogbow");
properties.put(ConfigurationConstants.XMPP_JID_KEY, "manager.test.com");
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
properties.put(ConfigurationConstants.MAX_WHOISALIVE_MANAGER_COUNT,
MAX_WHOISALIVE_MANAGER_COUNT);
@@ -301,20 +293,11 @@ public List getItemsFromIQ(Packet response) throws Certificate
String cpuInUse = statusEl.element("cpu-inuse").getText();
String memIdle = statusEl.element("mem-idle").getText();
String memInUse = statusEl.element("mem-inuse").getText();
- List flavoursList = new LinkedList();
- Iterator flavourIterator = itemEl.elementIterator("flavor");
- while (flavourIterator.hasNext()) {
- Element flavour = itemIterator.next();
- String name = flavour.element("name").getText();
- String cpu = flavour.element("cpu").getText();
- String mem = flavour.element("mem").getText();
- int capacity = Integer.parseInt(flavour.element("capacity").getText());
- Flavor flavor = new Flavor(name, cpu, mem, capacity);
- flavoursList.add(flavor);
- }
+ String instancesIdle = statusEl.element("instances-idle").getText();
+ String instancesInUse = statusEl.element("instances-inuse").getText();
ResourcesInfo resources = new ResourcesInfo(id.getValue(), cpuIdle, cpuInUse, memIdle,
- memInUse, flavoursList);
+ memInUse, instancesIdle, instancesInUse);
FederationMember item = new FederationMember(resources);
aliveItems.add(item);
}
@@ -335,8 +318,12 @@ public Properties getProperties(String path) throws IOException {
return properties;
}
- @SuppressWarnings("unchecked")
public ManagerController createDefaultManagerController() {
+ return createDefaultManagerController(null);
+ }
+
+ @SuppressWarnings("unchecked")
+ public ManagerController createDefaultManagerController(Map extraProperties) {
Properties properties = new Properties();
properties.put(ConfigurationConstants.XMPP_JID_KEY,
DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
@@ -350,9 +337,9 @@ public ManagerController createDefaultManagerController() {
DefaultDataTestHelper.SCHEDULER_PERIOD.toString());
properties.put(ConfigurationConstants.INSTANCE_MONITORING_PERIOD_KEY,
Long.toString(DefaultDataTestHelper.LONG_TIME));
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
properties.put(ConfigurationConstants.PREFIX_FLAVORS + "small", VALUE_FLAVOR_SMALL);
properties.put(ConfigurationConstants.PREFIX_FLAVORS + "medium", VALUE_FLAVOR_MEDIUM);
@@ -360,6 +347,13 @@ public ManagerController createDefaultManagerController() {
properties.put(ConfigurationConstants.SERVED_REQUEST_MONITORING_PERIOD_KEY,
String.valueOf(DefaultDataTestHelper.SERVED_REQUEST_MONITORING_PERIOD));
properties.put(ConfigurationConstants.GREEN_SITTER_JID, DefaultDataTestHelper.GREEN_SITTER_JID);
+
+ if (extraProperties != null) {
+ for (Entry entry : extraProperties.entrySet()) {
+ properties.put(entry.getKey(), entry.getValue());
+ }
+ }
+
this.executorService = Mockito.mock(ScheduledExecutorService.class);
ManagerController managerController = new ManagerController(properties,
executorService);
@@ -372,8 +366,7 @@ public ManagerController createDefaultManagerController() {
new OCCIException(ErrorType.QUOTA_EXCEEDED,
ResponseConstants.QUOTA_EXCEEDED_FOR_INSTANCES));
Mockito.when(computePlugin.getResourcesInfo(Mockito.any(Token.class))).thenReturn(
- new ResourcesInfo(LOCAL_MANAGER_COMPONENT_URL,
- "", "", "", "", new LinkedList()));
+ new ResourcesInfo(LOCAL_MANAGER_COMPONENT_URL, "", "", "", "", "", ""));
Mockito.when(computePlugin.getInstances(Mockito.any(Token.class))).thenReturn(
new ArrayList());
@@ -398,7 +391,7 @@ public ManagerController createDefaultManagerController() {
memberPickerPlugin = Mockito.mock(FederationMemberPicker.class);
Mockito.when(memberPickerPlugin.pick(Mockito.any(List.class))).thenReturn(
new FederationMember(new ResourcesInfo(
- DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL, "", "", "", null)));
+ DefaultDataTestHelper.REMOTE_MANAGER_COMPONENT_URL, "", "", "", "", "")));
// mocking benchmark executor
ExecutorService benchmarkExecutor = new CurrentThreadExecutorService();
diff --git a/src/test/java/org/fogbowcloud/manager/occi/TestBypassCompute.java b/src/test/java/org/fogbowcloud/manager/occi/TestBypassCompute.java
index 2defe7ae..951912ce 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/TestBypassCompute.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/TestBypassCompute.java
@@ -80,9 +80,9 @@ private void setup(List requests) throws Exception {
properties.put(OpenStackConfigurationConstants.COMPUTE_OCCI_FLAVOR_LARGE_KEY, OCCIComputeApplication.MEDIUM_FLAVOR_TERM);
properties.put(OpenStackConfigurationConstants.COMPUTE_OCCI_IMAGE_PREFIX + PluginHelper.LINUX_X86_TERM, PluginHelper.CIRROS_IMAGE_TERM);
properties.put(ConfigurationConstants.SCHEDULER_PERIOD_KEY, LITTLE_SCHEDULE_TIME);
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
defaultToken = new Token(PluginHelper.ACCESS_ID, PluginHelper.USERNAME,
diff --git a/src/test/java/org/fogbowcloud/manager/occi/TestMemberServerResource.java b/src/test/java/org/fogbowcloud/manager/occi/TestMemberServerResource.java
index 8e9d9f29..332c8f99 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/TestMemberServerResource.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/TestMemberServerResource.java
@@ -12,7 +12,6 @@
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.fogbowcloud.manager.core.model.FederationMember;
-import org.fogbowcloud.manager.core.model.Flavor;
import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.core.plugins.AccountingPlugin;
import org.fogbowcloud.manager.core.plugins.AuthorizationPlugin;
@@ -30,8 +29,6 @@
public class TestMemberServerResource {
- private final String FLAVOUR_1 = "flavour1";
- private final String FLAVOUR_2 = "flavour1";
private final String ID_RESOURCEINFO1 = "id1";
private final String ID_RESOURCEINFO2 = "id2";
@@ -46,7 +43,7 @@ public void setup() throws Exception {
this.computePlugin = Mockito.mock(ComputePlugin.class);
Mockito.when(computePlugin.getResourcesInfo(Mockito.any(Token.class))).thenReturn(
new ResourcesInfo(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL,
- "", "", "", "", new LinkedList()));
+ "", "", "", "", "", ""));
this.identityPlugin = Mockito.mock(IdentityPlugin.class);
this.accoutingPlugin = Mockito.mock(AccountingPlugin.class);
this.authorizationPlugin = Mockito.mock(AuthorizationPlugin.class);
@@ -61,13 +58,10 @@ public void tearDown() throws Exception {
@Test
public void testGetMember() throws Exception {
List federationMembers = new ArrayList();
- List flavours = new ArrayList();
- flavours.add(new Flavor(FLAVOUR_1, "3", "135", 2));
- flavours.add(new Flavor(FLAVOUR_2, "3", "135", 2));
ResourcesInfo resourcesInfo = new ResourcesInfo(ID_RESOURCEINFO1, "2", "1", "100", "35",
- flavours);
+ "", "");
ResourcesInfo resourcesInfo2 = new ResourcesInfo(ID_RESOURCEINFO2, "2", "1", "100", "35",
- null);
+ "", "");
federationMembers.add(new FederationMember(resourcesInfo));
federationMembers.add(new FederationMember(resourcesInfo));
federationMembers.add(new FederationMember(resourcesInfo2));
@@ -84,8 +78,6 @@ public void testGetMember() throws Exception {
String.valueOf(Charsets.UTF_8));
Assert.assertTrue(checkResponse(responseStr));
- Assert.assertTrue(responseStr.contains(FLAVOUR_1));
- Assert.assertTrue(responseStr.contains(FLAVOUR_2));
Assert.assertTrue(responseStr.contains(ID_RESOURCEINFO1));
Assert.assertTrue(responseStr.contains(ID_RESOURCEINFO2));
Assert.assertTrue(responseStr.contains(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL));
diff --git a/src/test/java/org/fogbowcloud/manager/occi/TestOCCIApplication.java b/src/test/java/org/fogbowcloud/manager/occi/TestOCCIApplication.java
index 174085b8..b09cf0b6 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/TestOCCIApplication.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/TestOCCIApplication.java
@@ -52,9 +52,9 @@ public void setUp() {
properties.put("scheduler_period", SCHEDULER_PERIOD.toString());
properties.put(ConfigurationConstants.XMPP_JID_KEY,
DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL);
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
ScheduledExecutorService executor = Mockito.mock(ScheduledExecutorService.class);
diff --git a/src/test/java/org/fogbowcloud/manager/occi/TestUsageServerResource.java b/src/test/java/org/fogbowcloud/manager/occi/TestUsageServerResource.java
index d2c960e1..49bef267 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/TestUsageServerResource.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/TestUsageServerResource.java
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -13,7 +12,6 @@
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.util.EntityUtils;
import org.fogbowcloud.manager.core.model.FederationMember;
-import org.fogbowcloud.manager.core.model.Flavor;
import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.core.plugins.AccountingPlugin;
import org.fogbowcloud.manager.core.plugins.AuthorizationPlugin;
@@ -50,15 +48,15 @@ public void setup() throws Exception {
this.computePlugin = Mockito.mock(ComputePlugin.class);
Mockito.when(computePlugin.getResourcesInfo(Mockito.any(Token.class))).thenReturn(
new ResourcesInfo(DefaultDataTestHelper.LOCAL_MANAGER_COMPONENT_URL,
- "", "", "", "", new LinkedList()));
+ "", "", "", "", "", ""));
this.identityPlugin = Mockito.mock(IdentityPlugin.class);
this.accountingPlugin = Mockito.mock(AccountingPlugin.class);
this.authorizationPlugin = Mockito.mock(AuthorizationPlugin.class);
ResourcesInfo resourcesInfo = new ResourcesInfo(ID_RESOURCEINFO1, "", "", "", "",
- new ArrayList());
+ "", "");
ResourcesInfo resourcesInfo2 = new ResourcesInfo(ID_RESOURCEINFO2, "", "", "", "",
- new ArrayList());
+ "", "");
federationMembers.add(new FederationMember(resourcesInfo));
federationMembers.add(new FederationMember(resourcesInfo2));
diff --git a/src/test/java/org/fogbowcloud/manager/occi/plugins/opennebula/TestComputeOpenNebula.java b/src/test/java/org/fogbowcloud/manager/occi/plugins/opennebula/TestComputeOpenNebula.java
index 264445dd..f6cee5f0 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/plugins/opennebula/TestComputeOpenNebula.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/plugins/opennebula/TestComputeOpenNebula.java
@@ -600,11 +600,8 @@ public void testGetResourcesInfo() {
Assert.assertEquals("0.0", resourcesInfo.getCpuInUse());
Assert.assertEquals("5120.0", resourcesInfo.getMemIdle());
Assert.assertEquals("0.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0", 10));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0", 5));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0", 2));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals("10", resourcesInfo.getInstancesIdle());
+ Assert.assertEquals("0", resourcesInfo.getInstancesInUse());
}
@Test
@@ -660,11 +657,8 @@ public void testGetResourcesInfoWithAllUserQuotaSmallerThanGroupQuota() {
Assert.assertEquals("0.0", resourcesInfo.getCpuInUse());
Assert.assertEquals("4096.0", resourcesInfo.getMemIdle());
Assert.assertEquals("0.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0", 5 / 1));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0", 5 / 2));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0", 5 / 4));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals("5", resourcesInfo.getInstancesIdle());
+ Assert.assertEquals("0", resourcesInfo.getInstancesInUse());
}
@Test
@@ -720,11 +714,8 @@ public void testGetResourcesInfoWithAllGroupQuotaSmallerThanUserQuota() {
Assert.assertEquals("0.0", resourcesInfo.getCpuInUse());
Assert.assertEquals("4096.0", resourcesInfo.getMemIdle());
Assert.assertEquals("0.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0", 5 / 1));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0", 5 / 2));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0", 5 / 4));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals("5", resourcesInfo.getInstancesIdle());
+ Assert.assertEquals("0", resourcesInfo.getInstancesInUse());
}
@Test
@@ -780,11 +771,8 @@ public void testGetResourcesInfoWithSomeUserQuotaSmallerThanGroup() {
Assert.assertEquals("0.0", resourcesInfo.getCpuInUse());
Assert.assertEquals("4096.0", resourcesInfo.getMemIdle());
Assert.assertEquals("0.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0", 5 / 1));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0", 5 / 2));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0", 5 / 4));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals("10", resourcesInfo.getInstancesIdle());
+ Assert.assertEquals("0", resourcesInfo.getInstancesInUse());
}
@Test
@@ -841,11 +829,8 @@ public void testGetResourcesInfoWithSomeUserQuotaSmallerThanGroupAndUsed() {
Assert.assertEquals("2944.0", resourcesInfo.getMemIdle()); // 4096 -
// 1152
Assert.assertEquals("1152.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0", 3 / 1));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0", 3 / 2));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0", 3 / 4));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals("7", resourcesInfo.getInstancesIdle());
+ Assert.assertEquals("3", resourcesInfo.getInstancesInUse());
}
@Test
@@ -908,15 +893,7 @@ public void testGetResourcesInfoWithValueDefaultOfQuota() {
String memIdleStr = String.valueOf(memIdle);
Assert.assertEquals(memIdleStr, resourcesInfo.getMemIdle());
Assert.assertEquals("1024.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, smallCpu, smallMem, calculateCapacity(
- cpuIdle, memIdle, smallCpu, smallMem, instanceIdle)));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, mediumCpu, mediumMem,
- calculateCapacity(cpuIdle, memIdle, mediumCpu, mediumMem, instanceIdle)));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, largeCpu, largeMem, calculateCapacity(
- cpuIdle, memIdle, largeCpu, largeMem, instanceIdle)));
-
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals(String.valueOf(instanceIdle), resourcesInfo.getInstancesIdle());
}
@Test
@@ -976,21 +953,9 @@ public void testGetResourcesInfoWithValueUnlimitedOfQuota() {
String memIdleStr = String.valueOf(memIdle);
Assert.assertEquals(memIdleStr, resourcesInfo.getMemIdle());
Assert.assertEquals("1024.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, smallCpu, smallMem, calculateCapacity(
- cpuIdle, memIdle, smallCpu, smallMem, instanceIdle)));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, mediumCpu, mediumMem,
- calculateCapacity(cpuIdle, memIdle, mediumCpu, mediumMem, instanceIdle)));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, largeCpu, largeMem, calculateCapacity(
- cpuIdle, memIdle, largeCpu, largeMem, instanceIdle)));
-
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
+ Assert.assertEquals(String.valueOf(instanceIdle), resourcesInfo.getInstancesIdle());
}
- private int calculateCapacity(double cpuIdle, double memIdle, String cpuFlavor, String memFlavor, int instancesIdle) {
- return Math.min((int) Math.min(cpuIdle / Double.parseDouble(cpuFlavor), memIdle / Double.parseDouble(memFlavor)), (int) instancesIdle);
- }
-
@Test
public void testGetResourcesInfoWithUsed() {
// mocking opennebula structures
@@ -1031,11 +996,6 @@ public void testGetResourcesInfoWithUsed() {
Assert.assertEquals("2.0", resourcesInfo.getCpuInUse());
Assert.assertEquals("4864.0", resourcesInfo.getMemIdle());
Assert.assertEquals("256.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0", 8));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0", 4));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0", 2));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
}
@Test
@@ -1087,14 +1047,6 @@ public void testGetResourcesInfoWithoutQuota() {
Assert.assertEquals(OpenNebulaComputePlugin.DEFAULT_RESOURCE_MAX_VALUE,
Double.parseDouble(resourcesInfo.getMemIdle()), 0.0001);
Assert.assertEquals("0.0", resourcesInfo.getMemInUse());
- List flavors = new ArrayList();
- flavors.add(new Flavor(RequestConstants.SMALL_TERM, "1.0", "128.0",
- OpenNebulaComputePlugin.DEFAULT_RESOURCE_MAX_VALUE / 128));
- flavors.add(new Flavor(RequestConstants.MEDIUM_TERM, "2.0", "256.0",
- OpenNebulaComputePlugin.DEFAULT_RESOURCE_MAX_VALUE / 256));
- flavors.add(new Flavor(RequestConstants.LARGE_TERM, "4.0", "512.0",
- OpenNebulaComputePlugin.DEFAULT_RESOURCE_MAX_VALUE / 512));
- Assert.assertEquals(flavors, resourcesInfo.getFlavors());
}
@Test
diff --git a/src/test/java/org/fogbowcloud/manager/occi/plugins/openstack/TestNovaV2ComputeOpenStack.java b/src/test/java/org/fogbowcloud/manager/occi/plugins/openstack/TestNovaV2ComputeOpenStack.java
index 2df89d08..2e29d688 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/plugins/openstack/TestNovaV2ComputeOpenStack.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/plugins/openstack/TestNovaV2ComputeOpenStack.java
@@ -19,7 +19,6 @@
import org.apache.http.message.BasicStatusLine;
import org.fogbowcloud.manager.core.RequirementsHelper;
import org.fogbowcloud.manager.core.model.Flavor;
-import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.core.plugins.openstack.KeystoneIdentityPlugin;
import org.fogbowcloud.manager.core.plugins.openstack.OpenStackConfigurationConstants;
import org.fogbowcloud.manager.core.plugins.openstack.OpenStackNovaV2ComputePlugin;
@@ -65,7 +64,7 @@ public void setUp() throws Exception {
flavors.add(flavorSmall);
flavors.add(new Flavor("medium", "2", "2000", "20"));
flavors.add(new Flavor("big", "4", "4000", "40"));
- novaV2ComputeOpenStack.setFlavors(flavors );
+ novaV2ComputeOpenStack.setFlavors(flavors);
HashMap tokenAtt = new HashMap();
tokenAtt.put(KeystoneIdentityPlugin.TENANT_ID, "tenantid");
@@ -258,16 +257,6 @@ public void testRemoveInstances(){
Assert.assertEquals(0, novaV2ComputeOpenStack.getInstances(defaultToken).size());
}
- @Test
- public void testCapacity() {
- ResourcesInfo resourcesInfo = novaV2ComputeOpenStack.getResourcesInfo(defaultToken);
- List flavors = resourcesInfo.getFlavors();
- // Limited by instance count
- Assert.assertEquals(2, (int) flavors.get(0).getCapacity());
- Assert.assertEquals(2, (int) flavors.get(1).getCapacity());
- Assert.assertEquals(2, (int) flavors.get(2).getCapacity());
- }
-
@Test
public void testUpdateFlavor() throws HttpException, IOException {
HttpClient client = Mockito.mock(HttpClient.class);
diff --git a/src/test/java/org/fogbowcloud/manager/occi/plugins/validators/TestWhitelistMemberValidator.java b/src/test/java/org/fogbowcloud/manager/occi/plugins/validators/TestWhitelistMemberValidator.java
index 0ffa06d1..de248c3d 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/plugins/validators/TestWhitelistMemberValidator.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/plugins/validators/TestWhitelistMemberValidator.java
@@ -27,26 +27,26 @@ public void setup() {
@Test
public void testCanDonateTo() throws Exception {
Assert.assertTrue(memberValidator.canDonateTo(
- new FederationMember(new ResourcesInfo("donate1", "", "", "", "", null)),
+ new FederationMember(new ResourcesInfo("donate1", "", "", "", "", "", "")),
null));
}
@Test
public void testCantDonateTo() throws Exception {
Assert.assertFalse(memberValidator.canDonateTo(
- new FederationMember(new ResourcesInfo("donate4", "", "", "", "", null)),
+ new FederationMember(new ResourcesInfo("donate4", "", "", "", "", "", "")),
null));
}
@Test
public void testCanReceiveFrom() throws Exception {
Assert.assertTrue(memberValidator.canReceiveFrom(
- new FederationMember(new ResourcesInfo("receive1", "", "", "", "", null))));
+ new FederationMember(new ResourcesInfo("receive1", "", "", "", "", "", ""))));
}
@Test
public void testCantReceiveFrom() throws Exception {
Assert.assertFalse(memberValidator.canReceiveFrom(
- new FederationMember(new ResourcesInfo("receive4", "", "", "", "", null))));
+ new FederationMember(new ResourcesInfo("receive4", "", "", "", "", "", ""))));
}
}
diff --git a/src/test/java/org/fogbowcloud/manager/occi/util/OCCITestHelper.java b/src/test/java/org/fogbowcloud/manager/occi/util/OCCITestHelper.java
index 8a47906d..f402f658 100644
--- a/src/test/java/org/fogbowcloud/manager/occi/util/OCCITestHelper.java
+++ b/src/test/java/org/fogbowcloud/manager/occi/util/OCCITestHelper.java
@@ -71,9 +71,9 @@ public void initializeComponentExecutorSameThread(ComputePlugin computePlugin,
Properties properties = new Properties();
properties.put(ConfigurationConstants.XMPP_JID_KEY, MEMBER_ID);
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
properties.put(ConfigurationConstants.PREFIX_FLAVORS + FOGBOW_SMALL_IMAGE, "{cpu=1,mem=100}");
@@ -89,9 +89,8 @@ public Future answer(InvocationOnMock invocation)
}
});
- ResourceRepository.init(properties);
-
ManagerController facade = new ManagerController(properties, executor);
+ ResourceRepository.init(properties);
facade.setComputePlugin(computePlugin);
facade.setAuthorizationPlugin(authorizationPlugin);
facade.setLocalIdentityPlugin(identityPlugin);
@@ -108,9 +107,9 @@ public void initializeComponent(ComputePlugin computePlugin, IdentityPlugin iden
component.getServers().add(Protocol.HTTP, ENDPOINT_PORT);
Properties properties = new Properties();
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
properties.put(ConfigurationConstants.PREFIX_FLAVORS + FOGBOW_SMALL_IMAGE,
"{cpu=1,mem=100}");
@@ -137,9 +136,9 @@ public void initializeComponentCompute(ComputePlugin computePlugin,
Properties properties = new Properties();
properties.put(ConfigurationConstants.XMPP_JID_KEY, MEMBER_ID);
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
ManagerController facade = new ManagerController(properties);
facade.setComputePlugin(computePlugin);
diff --git a/src/test/java/org/fogbowcloud/manager/xmpp/TestFederationMember.java b/src/test/java/org/fogbowcloud/manager/xmpp/TestFederationMember.java
index 0963f701..4a60a50c 100644
--- a/src/test/java/org/fogbowcloud/manager/xmpp/TestFederationMember.java
+++ b/src/test/java/org/fogbowcloud/manager/xmpp/TestFederationMember.java
@@ -5,10 +5,8 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.LinkedList;
import org.fogbowcloud.manager.core.model.FederationMember;
-import org.fogbowcloud.manager.core.model.Flavor;
import org.fogbowcloud.manager.core.model.ResourcesInfo;
import org.fogbowcloud.manager.core.util.ManagerTestHelper;
import org.junit.Assert;
@@ -35,25 +33,25 @@ public void testInvalidResources() {
@Test(expected = IllegalArgumentException.class)
public void testNullResourcesCpuIdle() throws CertificateException, IOException {
new ResourcesInfo("id", null,
- "cpuInUse", "memIdle", "memInUse", new LinkedList());
+ "cpuInUse", "memIdle", "memInUse", "", "");
}
@Test(expected = IllegalArgumentException.class)
public void testNullResourcesCpuInUse() throws CertificateException, IOException {
new ResourcesInfo("id", "CpuIdle",
- null, "memIdle", "memInUse", new LinkedList());
+ null, "memIdle", "memInUse", "", "");
}
@Test(expected = IllegalArgumentException.class)
public void testNullResourcesMemIdle() throws CertificateException, IOException {
new ResourcesInfo("id", "CpuIdle",
- "cpuInUse", null, "memInUse", new LinkedList());
+ "cpuInUse", null, "memInUse", "", "");
}
@Test(expected = IllegalArgumentException.class)
public void testNullResourcesMemInUse() throws CertificateException, IOException {
new ResourcesInfo("id", "CpuIdle",
- "cpuInUse", "memIdle", null, new LinkedList());
+ "cpuInUse", "memIdle", null, "", "");
}
@Test
diff --git a/src/test/java/org/fogbowcloud/manager/xmpp/TestIAmAlive.java b/src/test/java/org/fogbowcloud/manager/xmpp/TestIAmAlive.java
index 1e51ef7d..6501bf36 100644
--- a/src/test/java/org/fogbowcloud/manager/xmpp/TestIAmAlive.java
+++ b/src/test/java/org/fogbowcloud/manager/xmpp/TestIAmAlive.java
@@ -79,6 +79,9 @@ public boolean accept(Packet packet) {
String cpuInUse = iqelement.element("cpu-inuse").getText();
String memIdle = iqelement.element("mem-idle").getText();
String memInUse = iqelement.element("mem-inuse").getText();
+ String instancesIdle = iqelement.element("instances-idle").getText();
+ String instancesInUse = iqelement.element("instances-inuse").getText();
+
Assert.assertEquals(cpuIdle, managerTestHelper.getResources()
.getCpuIdle());
Assert.assertEquals(cpuInUse, managerTestHelper.getResources()
@@ -87,6 +90,10 @@ public boolean accept(Packet packet) {
.getMemIdle());
Assert.assertEquals(memInUse, managerTestHelper.getResources()
.getMemInUse());
+ Assert.assertEquals(instancesIdle, managerTestHelper.getResources()
+ .getInstancesIdle());
+ Assert.assertEquals(instancesInUse, managerTestHelper.getResources()
+ .getInstancesInUse());
xmppClient.disconnect();
}
diff --git a/src/test/java/org/fogbowcloud/manager/xmpp/TestIsInstanceBeenUsed.java b/src/test/java/org/fogbowcloud/manager/xmpp/TestIsInstanceBeenUsed.java
index 01bf86dd..e964c52e 100644
--- a/src/test/java/org/fogbowcloud/manager/xmpp/TestIsInstanceBeenUsed.java
+++ b/src/test/java/org/fogbowcloud/manager/xmpp/TestIsInstanceBeenUsed.java
@@ -136,9 +136,9 @@ private ManagerController createManagerController() {
properties.put(ConfigurationConstants.FEDERATION_USER_PASS_KEY, "fogbow");
properties.put(ConfigurationConstants.FEDERATION_USER_TENANT_NAME_KEY, "fogbow");
properties.put(ConfigurationConstants.XMPP_JID_KEY, "manager.test.com");
- properties.put(ConfigurationConstants.SSH_PRIVATE_HOST_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_PRIVATE_HOST_KEY,
DefaultDataTestHelper.SERVER_HOST);
- properties.put(ConfigurationConstants.SSH_HOST_HTTP_PORT_KEY,
+ properties.put(ConfigurationConstants.TUNNEL_SSH_HOST_HTTP_PORT_KEY,
String.valueOf(DefaultDataTestHelper.TOKEN_SERVER_HTTP_PORT));
properties.put(ConfigurationConstants.MAX_WHOISALIVE_MANAGER_COUNT,
ManagerTestHelper.MAX_WHOISALIVE_MANAGER_COUNT);
diff --git a/src/test/java/org/fogbowcloud/manager/xmpp/TestRequestRemoteInstance.java b/src/test/java/org/fogbowcloud/manager/xmpp/TestRequestRemoteInstance.java
index a72be21c..9c6ddfd8 100644
--- a/src/test/java/org/fogbowcloud/manager/xmpp/TestRequestRemoteInstance.java
+++ b/src/test/java/org/fogbowcloud/manager/xmpp/TestRequestRemoteInstance.java
@@ -57,9 +57,11 @@ public void testRequestRemoteInstanceAsynchronously() throws Exception {
INSTANCE_DEFAULT);
final BlockingQueue