Commit c2b64816 authored by Joerg Domaschka's avatar Joerg Domaschka

Merge pull request #15 from cloudiator/ps-167

Ps 167
parents 507f5613 05037508
......@@ -165,11 +165,11 @@ public final class LifecycleClient {
}
/**
* @param myInstanceId
* @param lsyAppId
* @param myInstanceId the instance id
* @param lsyAppId the aplication id
* @return true if this application instance has been added successfully. false if it was already contained
* in the registry.
* @throws RegistrationException
* @throws RegistrationException when an registration error occurs
*/
public boolean registerApplicationInstance(ApplicationInstanceId myInstanceId,
ApplicationId lsyAppId) throws RegistrationException {
......
......@@ -51,6 +51,7 @@ public final class OperatingSystemVersion implements Serializable {
*
* @param year in 'y' or 'yy' format
* @param month either 10 or 4
* @return returns the operating system object
*/
public static OperatingSystemVersion getUbuntuVersion(int year, int month) {
if(year > 6 && year <= (Calendar.getInstance().get(Calendar.YEAR) % 100) &&
......
......@@ -33,12 +33,12 @@ import de.uniulm.omi.cloudiator.lance.lca.registry.RegistrationException;
public interface LcaRegistry extends Serializable {
/**
* @param instId
* @param appId
* @param name
* @param instId the uuid of the application instance
* @param appId the uuid of the application
* @param name the name of the application
* @return @return true if this application instance has been added successfully. false if it was already contained
* in the registry.
* @throws RegistrationException
* @throws RegistrationException when a registration error occurs.
*/
public boolean addApplicationInstance(ApplicationInstanceId instId, ApplicationId appId, String name) throws RegistrationException;
public void addComponent(ApplicationInstanceId instId, ComponentId cid, String name) throws RegistrationException;
......
......@@ -83,7 +83,7 @@ public enum ContainerType {
}
/**
* @param containername
* @param containername the name of the containers
* @return returns the ContainerType matching the parameter. Null otherwise.
*/
public static ContainerType fromString(String containername) {
......
......@@ -44,6 +44,7 @@ public interface ContainerLogic {
*
* @return null if no address is available;
* otherwise a stringified form of an IP address
* @throws ContainerException when a container-specific exception occurs
*/
String getLocalAddress() throws ContainerException;
......
......@@ -119,8 +119,6 @@ public class DockerContainerLogic implements ContainerLogic, LifecycleActionInte
}
}
/** retrieved the actual port numbers and the way docker maps them
* @throws DockerException */
@Override
public InportAccessor getPortMapper() {
return ( (portName, clientState) -> {
......
......@@ -37,7 +37,7 @@ public interface DockerConnector {
* @param key should be the id to use; either component id after initialisation
* of the component instance id after configuration
* @param os will be used as a tag in both cases
* @return
* @return the name of the container
* @throws DockerException
*/
String createImageSnapshot(ComponentInstanceId containerId, String key, OperatingSystem os) throws DockerException;
......
......@@ -121,9 +121,9 @@ public class PlainContainerLogic implements ContainerLogic, LifecycleActionInter
}
/**
* loops the port numbers through <a,b> -> <(a,a) , (b,b)>
* loops the port numbers through (a,b) --- ((a,a) , (b,b))
*
* @return
* @return the inport accessor
*/
@Override
public InportAccessor getPortMapper() {
......
......@@ -129,6 +129,8 @@ public final class StateMachine<T extends Enum<?> & State > {
}
/**
* @param startState the start state of the transition
* @param params set of application specific parameters to be passed through to the
* transition
*/
public synchronized void transit(T startState, Object[] params) {
StateTransition<T> transition = findTransition(startState);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment