cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ni...@apache.org
Subject [46/51] [partial] merge master
Date Sat, 11 May 2013 10:00:11 GMT
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
deleted file mode 100644
index d8f0529..0000000
--- a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerAnswer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.baremetal;
-
-import com.cloud.agent.api.Answer;
-
-public class PreparePxeServerAnswer extends Answer {
-	public PreparePxeServerAnswer(PreparePxeServerCommand cmd) {
-		super(cmd, true, "SUCCESS");
-	}
-
-	public PreparePxeServerAnswer(PreparePxeServerCommand cmd, String details) {
-		super(cmd, false, details);
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java b/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
deleted file mode 100644
index 6c73563..0000000
--- a/api/src/com/cloud/agent/api/baremetal/PreparePxeServerCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.baremetal;
-
-import com.cloud.agent.api.Command;
-
-public class PreparePxeServerCommand extends Command {
-
-	String ip;
-	String mac;
-	String netMask;
-	String gateway;
-	String dns;
-	String template;
-	String vmName;
-	String hostName;
-
-	@Override
-	public boolean executeInSequence() {
-		return true;
-	}
-
-	public PreparePxeServerCommand(String ip, String mac, String netMask, String gateway, String dns, String template, String vmName, String hostName) {
-		this.ip = ip;
-		this.mac = mac;
-		this.netMask = netMask;
-		this.gateway = gateway;
-		this.dns = dns;
-		this.template = template;
-		this.vmName = vmName;
-		this.hostName = hostName;
-	}
-
-	public String getIp() {
-		return ip;
-	}
-
-	public String getMac() {
-		return mac;
-	}
-
-	public String getNetMask() {
-		return netMask;
-	}
-
-	public String getGateWay() {
-		return gateway;
-	}
-
-	public String getDns() {
-		return dns;
-	}
-
-	public String getTemplate() {
-		return template;
-	}
-
-	public String getVmName() {
-		return vmName;
-	}
-
-	public String getHostName() {
-		return hostName;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java b/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
deleted file mode 100644
index b187420..0000000
--- a/api/src/com/cloud/agent/api/baremetal/prepareCreateTemplateCommand.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.baremetal;
-
-import com.cloud.agent.api.Command;
-
-public class prepareCreateTemplateCommand extends Command {
-    String ip;
-    String mac;
-    String netMask;
-    String gateway;
-    String dns;
-    String template;
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public prepareCreateTemplateCommand(String ip, String mac, String netMask, String gateway, String dns, String template) {
-        this.ip = ip;
-        this.mac = mac;
-        this.netMask = netMask;
-        this.gateway = gateway;
-        this.dns = dns;
-        this.template = template;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public String getMac() {
-        return mac;
-    }
-
-    public String getNetMask() {
-        return netMask;
-    }
-
-    public String getGateWay() {
-        return gateway;
-    }
-
-    public String getDns() {
-        return dns;
-    }
-
-    public String getTemplate() {
-        return template;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java b/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
deleted file mode 100644
index 3414eb0..0000000
--- a/api/src/com/cloud/agent/api/check/CheckSshAnswer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.check;
-
-import com.cloud.agent.api.Answer;
-
-public class CheckSshAnswer extends Answer {
-    protected CheckSshAnswer() {
-
-    }
-
-    public CheckSshAnswer(CheckSshCommand cmd) {
-        super(cmd, true, null);
-    }
-
-    public CheckSshAnswer(CheckSshCommand cmd, String details) {
-        super(cmd, false, details);
-    }
-
-    public CheckSshAnswer(CheckSshCommand cmd, Throwable th) {
-        super(cmd, false, th.getMessage());
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/check/CheckSshCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/check/CheckSshCommand.java b/api/src/com/cloud/agent/api/check/CheckSshCommand.java
deleted file mode 100644
index e384983..0000000
--- a/api/src/com/cloud/agent/api/check/CheckSshCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.check;
-
-import com.cloud.agent.api.Command;
-
-public class CheckSshCommand extends Command {
-    String ip;
-    int port;
-    int interval;
-    int retries;
-    String name;
-
-    protected CheckSshCommand() {
-        super();
-    }
-
-    public CheckSshCommand(String instanceName, String ip, int port) {
-        super();
-        this.ip = ip;
-        this.port = port;
-        this.interval = 6;
-        this.retries = 100;
-        this.name = instanceName;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getIp() {
-        return ip;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public int getInterval() {
-        return interval;
-    }
-
-    public int getRetries() {
-        return retries;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java b/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
deleted file mode 100644
index a2ae611..0000000
--- a/api/src/com/cloud/agent/api/downloadSnapshotFromSwiftCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-import com.cloud.agent.api.to.SwiftTO;
-
-/**
- * This currently assumes that both primary and secondary storage are mounted on the XenServer.
- */
-public class downloadSnapshotFromSwiftCommand extends SnapshotCommand {
-    @LogLevel(Log4jLevel.Off)
-    private SwiftTO _swift;
-
-    private String _parent;
-
-    protected downloadSnapshotFromSwiftCommand() {
-
-    }
-
-    public downloadSnapshotFromSwiftCommand(SwiftTO swift, String secondaryStorageUrl, Long dcId, Long accountId, Long volumeId, String parent, String BackupUuid, int wait) {
-
-        super(null, secondaryStorageUrl, BackupUuid, "", dcId, accountId, volumeId);
-        setParent(parent);
-        setSwift(swift);
-        setWait(wait);
-    }
-
-
-    public SwiftTO getSwift() {
-        return this._swift;
-    }
-
-    public void setSwift(SwiftTO swift) {
-        this._swift = swift;
-    }
-
-    public String getParent() {
-        return _parent;
-    }
-
-    public void setParent(String parent) {
-        this._parent = parent;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java b/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
deleted file mode 100644
index 8229065..0000000
--- a/api/src/com/cloud/agent/api/downloadTemplateFromSwiftToSecondaryStorageCommand.java
+++ /dev/null
@@ -1,90 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api;
-
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-import com.cloud.agent.api.to.SwiftTO;
-
-/**
- *
- *
- */
-
-public class downloadTemplateFromSwiftToSecondaryStorageCommand extends Command {
-    @LogLevel(Log4jLevel.Off)
-    private SwiftTO swift;
-    private String secondaryStorageUrl;
-
-    private Long dcId;
-    private Long accountId;
-    private Long templateId;
-    private String path;
-
-    protected downloadTemplateFromSwiftToSecondaryStorageCommand() {
-
-    }
-
-    public downloadTemplateFromSwiftToSecondaryStorageCommand(SwiftTO swift, String secondaryStorageUrl, Long dcId, Long accountId, Long templateId, String path, int wait) {
-
-        this.swift = swift;
-        this.secondaryStorageUrl = secondaryStorageUrl;
-        this.dcId = dcId;
-        this.accountId = accountId;
-        this.templateId = templateId;
-        this.path = path;
-        setWait(wait);
-    }
-
-    public SwiftTO getSwift() {
-        return this.swift;
-    }
-
-    public void setSwift(SwiftTO swift) {
-        this.swift = swift;
-    }
-
-    public String getSecondaryStorageUrl() {
-        return secondaryStorageUrl;
-    }
-
-    public Long getDcId() {
-        return dcId;
-    }
-
-    public Long getAccountId() {
-        return accountId;
-    }
-
-    public Long getTemplateId() {
-        return templateId;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        // TODO Auto-generated method stub
-        return true;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
deleted file mode 100644
index 7582b0d..0000000
--- a/api/src/com/cloud/agent/api/proxy/CheckConsoleProxyLoadCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.proxy;
-
-
-/**
- * CheckConsoleProxyLoadCommand implements one-shot console proxy load-scan command
- */
-public class CheckConsoleProxyLoadCommand extends ProxyCommand {
-
-	private long proxyVmId;
-	private String proxyVmName;
-	private String proxyManagementIp;
-	private int proxyCmdPort;
-
-	public CheckConsoleProxyLoadCommand() {
-	}
-
-	public CheckConsoleProxyLoadCommand(long proxyVmId, String proxyVmName, String proxyManagementIp, int proxyCmdPort) {
-		this.proxyVmId = proxyVmId;
-		this.proxyVmName = proxyVmName;
-		this.proxyManagementIp = proxyManagementIp;
-		this.proxyCmdPort = proxyCmdPort;
-	}
-
-	public long getProxyVmId() {
-		return proxyVmId;
-	}
-
-	public String getProxyVmName() {
-		return proxyVmName;
-	}
-
-	public String getProxyManagementIp() {
-		return proxyManagementIp;
-	}
-
-	public int getProxyCmdPort() {
-		return proxyCmdPort;
-	}
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java b/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
deleted file mode 100644
index ae93f51..0000000
--- a/api/src/com/cloud/agent/api/proxy/ConsoleProxyLoadAnswer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.proxy;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.Command;
-
-public class ConsoleProxyLoadAnswer extends Answer {
-
-	private long proxyVmId;
-	private String proxyVmName;
-
-	protected ConsoleProxyLoadAnswer() {
-	}
-
-	public ConsoleProxyLoadAnswer(Command command, long proxyVmId, String proxyVmName, boolean success, String details) {
-		super(command, success, details);
-
-		this.proxyVmId = proxyVmId;
-		this.proxyVmName = proxyVmName;
-	}
-
-	public long getProxyVmId() {
-		return proxyVmId;
-	}
-
-	public String getProxyVmName() {
-		return proxyVmName;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/proxy/ProxyCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/ProxyCommand.java b/api/src/com/cloud/agent/api/proxy/ProxyCommand.java
deleted file mode 100644
index b283eb8..0000000
--- a/api/src/com/cloud/agent/api/proxy/ProxyCommand.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.proxy;
-
-import com.cloud.agent.api.Command;
-
-public abstract class ProxyCommand extends Command {
-    protected ProxyCommand() {
-        super();
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java b/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
deleted file mode 100644
index 3befc2f..0000000
--- a/api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java
+++ /dev/null
@@ -1,68 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.proxy;
-
-import com.cloud.agent.api.Command;
-import com.cloud.agent.api.LogLevel;
-import com.cloud.agent.api.LogLevel.Log4jLevel;
-
-public class StartConsoleProxyAgentHttpHandlerCommand extends Command {
-    @LogLevel(Log4jLevel.Off)
-	private byte[] keystoreBits;
-    @LogLevel(Log4jLevel.Off)
-	private String keystorePassword;
-    @LogLevel(Log4jLevel.Off)
-	private String encryptorPassword;
-
-	public StartConsoleProxyAgentHttpHandlerCommand() {
-		super();
-	}
-
-	public StartConsoleProxyAgentHttpHandlerCommand(byte[] ksBits, String ksPassword) {
-		this.keystoreBits = ksBits;
-		this.keystorePassword = ksPassword;
-	}
-
-	@Override
-	public boolean executeInSequence() {
-		return true;
-	}
-
-	public byte[] getKeystoreBits() {
-		return keystoreBits;
-	}
-
-	public void setKeystoreBits(byte[] keystoreBits) {
-		this.keystoreBits = keystoreBits;
-	}
-
-	public String getKeystorePassword() {
-		return keystorePassword;
-	}
-
-	public void setKeystorePassword(String keystorePassword) {
-		this.keystorePassword = keystorePassword;
-	}
-
-	public String getEncryptorPassword() {
-		return encryptorPassword;
-	}
-
-	public void setEncryptorPassword(String encryptorPassword) {
-		this.encryptorPassword = encryptorPassword;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java b/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
deleted file mode 100644
index ef4a549..0000000
--- a/api/src/com/cloud/agent/api/proxy/WatchConsoleProxyLoadCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.proxy;
-
-import com.cloud.agent.api.CronCommand;
-
-public class WatchConsoleProxyLoadCommand extends ProxyCommand implements CronCommand {
-
-	private long proxyVmId;
-	private String proxyVmName;
-	private String proxyManagementIp;
-	private int proxyCmdPort;
-	int interval;
-
-    public WatchConsoleProxyLoadCommand(int interval, long proxyVmId, String proxyVmName,
-    	String proxyManagementIp, int proxyCmdPort) {
-        this.interval = interval;
-    	this.proxyVmId = proxyVmId;
-		this.proxyVmName = proxyVmName;
-		this.proxyManagementIp = proxyManagementIp;
-		this.proxyCmdPort = proxyCmdPort;
-    }
-
-	protected WatchConsoleProxyLoadCommand() {
-	}
-
-	public long getProxyVmId() {
-		return proxyVmId;
-	}
-
-	public String getProxyVmName() {
-		return proxyVmName;
-	}
-
-	public String getProxyManagementIp() {
-		return proxyManagementIp;
-	}
-
-	public int getProxyCmdPort() {
-		return proxyCmdPort;
-	}
-
-	public int getInterval() {
-	    return interval;
-	}
-
-	@Override
-    public boolean executeInSequence() {
-	    return false;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java b/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
deleted file mode 100644
index dc7f1a1..0000000
--- a/api/src/com/cloud/agent/api/routing/CreateLoadBalancerApplianceCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-/** NetworkElementCommand to spin a load balancer appliance */
-
-public class CreateLoadBalancerApplianceCommand extends NetworkElementCommand {
-
-    String ip;
-    String netmask;
-    String gateway;
-    String username;
-    String password;
-    String publicInterface;
-    String privateInterface;
-
-    public CreateLoadBalancerApplianceCommand(String ip, String netmask, String gateway) {
-        this.ip = ip;
-        this.netmask = netmask;
-        this.gateway = gateway;
-    }
-
-    public String getLoadBalancerIP() {
-        return ip;
-    }
-
-    public String getNetmask() {
-        return netmask;
-    }
-
-    public String getGateway() {
-        return gateway;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java b/api/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
deleted file mode 100644
index 5f46d82..0000000
--- a/api/src/com/cloud/agent/api/routing/DestroyLoadBalancerApplianceCommand.java
+++ /dev/null
@@ -1,32 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-/** NetworkElementCommand to destroy a VPX instance on the Netscaler SDX load balancer appliance */
-//TODO: fill in the Nitro API parameters required
-package com.cloud.agent.api.routing;
-
-public class DestroyLoadBalancerApplianceCommand extends NetworkElementCommand {
-
-    String ip;
-
-    public DestroyLoadBalancerApplianceCommand(String ip) {
-        this.ip = ip;
-    }
-
-    public String getLoadBalancerIP() {
-        return ip;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
deleted file mode 100644
index fd8d84c..0000000
--- a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
+++ /dev/null
@@ -1,142 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-
-public class DhcpEntryCommand extends NetworkElementCommand {
-
-    String vmMac;
-    String vmIpAddress;
-    String vmName;
-    String dns;
-    String gateway;
-    String nextServer;
-    String defaultRouter;
-    String staticRoutes;
-    String defaultDns;
-    String vmIp6Address;
-    String ip6Gateway;
-    String duid;
-    private boolean isDefault;
-
-    protected DhcpEntryCommand() {
-
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address) {
-        this.vmMac = vmMac;
-        this.vmIpAddress = vmIpAddress;
-        this.vmName = vmName;
-        this.vmIp6Address = vmIp6Address;
-        this.setDefault(true);
-    }
-
-    public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String vmIp6Address, String dns, String gateway, String ip6Gateway) {
-        this(vmMac, vmIpAddress, vmName, vmIp6Address);
-        this.dns = dns;
-        this.gateway = gateway;
-    }
-
-    public String getDns() {
-        return dns;
-    }
-
-    public String getGateway() {
-        return gateway;
-    }
-
-    public String getVmMac() {
-        return vmMac;
-    }
-
-    public String getVmIpAddress() {
-        return vmIpAddress;
-    }
-
-    public String getVmName() {
-        return vmName;
-    }
-
-    public void setNextServer(String ip) {
-        nextServer = ip;
-    }
-
-    public String getNextServer() {
-        return nextServer;
-    }
-
-    public String getDefaultRouter() {
-        return defaultRouter;
-    }
-
-    public void setDefaultRouter(String defaultRouter) {
-        this.defaultRouter = defaultRouter;
-    }
-
-    public String getStaticRoutes() {
-        return staticRoutes;
-    }
-
-    public void setStaticRoutes(String staticRoutes) {
-        this.staticRoutes = staticRoutes;
-    }
-
-	public String getDefaultDns() {
-		return defaultDns;
-	}
-
-	public void setDefaultDns(String defaultDns) {
-		this.defaultDns = defaultDns;
-	}
-
-	public String getIp6Gateway() {
-		return ip6Gateway;
-	}
-
-	public void setIp6Gateway(String ip6Gateway) {
-		this.ip6Gateway = ip6Gateway;
-	}
-
-	public String getDuid() {
-		return duid;
-	}
-
-	public void setDuid(String duid) {
-		this.duid = duid;
-	}
-
-	public String getVmIp6Address() {
-		return vmIp6Address;
-	}
-
-	public void setVmIp6Address(String ip6Address) {
-		this.vmIp6Address = ip6Address;
-	}
-
-	public boolean isDefault() {
-		return isDefault;
-	}
-
-	public void setDefault(boolean isDefault) {
-		this.isDefault = isDefault;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java b/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
deleted file mode 100644
index e5167fe..0000000
--- a/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigAnswer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class GlobalLoadBalancerConfigAnswer extends Answer{
-
-    public GlobalLoadBalancerConfigAnswer(boolean success, String details) {
-        this.result = success;
-        this.details = details;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
deleted file mode 100644
index b3603c8..0000000
--- a/api/src/com/cloud/agent/api/routing/GlobalLoadBalancerConfigCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Command;
-
-import java.util.List;
-
-/**
- * GlobalLoadBalancerConfigCommand used for sending the GSLB configuration to GSLB service provider
- */
-public class GlobalLoadBalancerConfigCommand extends Command {
-
-    // FQDN that represents the globally load balanced service
-    String domainName;
-
-    // type of the globally load balanced service
-    String serviceType;
-
-    // load balancing method to distribute traffic across the sites participating in global service load balancing
-    String lbMethod;
-
-    // session persistence type
-    String persistenceType;
-
-    // unique Id given per gslb rule, that is uniquely represents glsb rule on all participant sites
-    long gslbId;
-
-    // true if global load balancer rule is being deleted
-    boolean revoked;
-
-    // list of the site details that are participating in the GSLB service
-    List<SiteLoadBalancerConfig> siteLoadBalancers;
-
-    public GlobalLoadBalancerConfigCommand(String domainName,
-                                                 String lbMethod,
-                                                 String persistenceType,
-                                                 String serviceType,
-                                                 long gslbId,
-                                                 boolean revoked) {
-        this.domainName = domainName;
-        this.serviceType = serviceType;
-        this.lbMethod = lbMethod;
-        this.persistenceType = persistenceType;
-        this.gslbId = gslbId;
-        this.revoked = revoked;
-    }
-
-    public List<SiteLoadBalancerConfig> getSiteDetails() {
-        return siteLoadBalancers;
-    }
-
-    public void setSiteLoadBalancers(List<SiteLoadBalancerConfig> siteLoadBalancers) {
-        this.siteLoadBalancers = siteLoadBalancers;
-    }
-
-    public String getServiceType() {
-        return serviceType;
-    }
-
-    public String getLoadBalancerMethod() {
-        return lbMethod;
-    }
-
-    public String getPersistenceType() {
-        return persistenceType;
-    }
-
-    public long getGslbId() {
-        return this.gslbId;
-    }
-
-    public String getDomainName() {
-        return domainName;
-    }
-
-    public boolean isForRevoke() {
-        return revoked;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java b/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
deleted file mode 100644
index dfca4ab..0000000
--- a/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigAnswer.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import java.util.List;
-
-import com.cloud.agent.api.Answer;
-import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.NicTO;
-
-/**
- * LoadBalancerConfigCommand sends the load balancer configuration
- */
-public class HealthCheckLBConfigAnswer extends Answer {
-    List<LoadBalancerTO> loadBalancers;
-
-    protected HealthCheckLBConfigAnswer() {
-    }
-
-    public HealthCheckLBConfigAnswer(List<LoadBalancerTO> loadBalancers) {
-        this.loadBalancers = loadBalancers;
-    }
-
-    public List<LoadBalancerTO> getLoadBalancers() {
-        return loadBalancers;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java b/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
deleted file mode 100644
index f705f6c..0000000
--- a/api/src/com/cloud/agent/api/routing/HealthCheckLBConfigCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.NicTO;
-
-/**
- * LoadBalancerConfigCommand sends the load balancer configuration
- */
-public class HealthCheckLBConfigCommand extends NetworkElementCommand {
-    LoadBalancerTO[] loadBalancers;
-
-    protected HealthCheckLBConfigCommand() {
-    }
-
-    public HealthCheckLBConfigCommand(LoadBalancerTO[] loadBalancers) {
-        this.loadBalancers = loadBalancers;
-    }
-
-    public LoadBalancerTO[] getLoadBalancers() {
-        return loadBalancers;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java b/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
deleted file mode 100644
index 194923c..0000000
--- a/api/src/com/cloud/agent/api/routing/IpAssocAnswer.java
+++ /dev/null
@@ -1,48 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class IpAssocAnswer extends Answer{
-    String[] results;
-
-    public static final String errorResult = "Failed";
-
-    protected IpAssocAnswer() {
-        super();
-    }
-
-    public IpAssocAnswer(IpAssocCommand cmd, String[] results) {
-
-        boolean finalResult = true;
-        for (String result : results) {
-            if (result.equals(errorResult)) {
-                finalResult = false;
-                break;
-            }
-        }
-        this.result = finalResult;
-        this.details = null;
-        assert(cmd.getIpAddresses().length == results.length) : "Shouldn't the results match the commands?";
-        this.results = results;
-    }
-
-    String[] getResults() {
-        return results;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
deleted file mode 100644
index 5cdc2da..0000000
--- a/api/src/com/cloud/agent/api/routing/IpAssocCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.to.IpAddressTO;
-
-public class IpAssocCommand extends NetworkElementCommand {
-
-	IpAddressTO[] ipAddresses;
-
-	protected IpAssocCommand() {
-	}
-
-	public IpAssocCommand(IpAddressTO[] ips) {
-		this.ipAddresses = ips;
-	}
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public IpAddressTO[] getIpAddresses() {
-        return ipAddresses;
-    }
-
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java b/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
deleted file mode 100644
index e5c900d..0000000
--- a/api/src/com/cloud/agent/api/routing/IpAssocVpcCommand.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.to.IpAddressTO;
-
-public class IpAssocVpcCommand extends IpAssocCommand{
-    protected IpAssocVpcCommand() {
-        super();
-    }
-
-    public IpAssocVpcCommand(IpAddressTO[] ips) {
-        super(ips);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java b/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
deleted file mode 100644
index 1c1fb91..0000000
--- a/api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
+++ /dev/null
@@ -1,66 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.to.LoadBalancerTO;
-import com.cloud.agent.api.to.NicTO;
-
-/**
- * LoadBalancerConfigCommand sends the load balancer configuration
- */
-public class LoadBalancerConfigCommand extends NetworkElementCommand {
-    LoadBalancerTO[] loadBalancers;
-    public String lbStatsVisibility = "guest-network";
-    public String lbStatsPublicIP; /* load balancer listen on this ips for stats */
-    public String lbStatsPrivateIP; /* load balancer listen on this ips for stats */
-    public String lbStatsGuestIP; /* load balancer listen on this ips for stats */
-    public String lbStatsPort = "8081"; /*load balancer listen on this port for stats */
-    public String lbStatsSrcCidrs = "0/0" ; /* TODO : currently there is no filtering based on the source ip */
-    public String lbStatsAuth = "admin1:AdMiN123";
-    public String lbStatsUri = "/admin?stats";
-    NicTO nic;
-    Long vpcId;
-
-    protected LoadBalancerConfigCommand() {
-    }
-
-    public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers, Long vpcId) {
-    	this.loadBalancers = loadBalancers;
-    	this.vpcId = vpcId;
-    }
-
-    public LoadBalancerConfigCommand(LoadBalancerTO[] loadBalancers,String PublicIp,String GuestIp,String PrivateIp, NicTO nic, Long vpcId) {
-    	this.loadBalancers = loadBalancers;
-    	this.lbStatsPublicIP = PublicIp;
-    	this.lbStatsPrivateIP = PrivateIp;
-    	this.lbStatsGuestIP = GuestIp;
-    	this.nic = nic;
-    	this.vpcId = vpcId;
-    }
-
-    public NicTO getNic() {
-        return nic;
-    }
-
-	public LoadBalancerTO[] getLoadBalancers() {
-        return loadBalancers;
-    }
-
-    public Long getVpcId() {
-        return vpcId;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java b/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
deleted file mode 100644
index 41ae80f..0000000
--- a/api/src/com/cloud/agent/api/routing/NetworkElementCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import java.util.HashMap;
-
-import com.cloud.agent.api.Command;
-
-public abstract class NetworkElementCommand extends Command {
-    HashMap<String, String> accessDetails = new HashMap<String, String>(0);
-
-    public static final String ACCOUNT_ID = "account.id";
-    public static final String GUEST_NETWORK_CIDR = "guest.network.cidr";
-    public static final String GUEST_NETWORK_GATEWAY = "guest.network.gateway";
-    public static final String GUEST_VLAN_TAG = "guest.vlan.tag";
-    public static final String ROUTER_NAME = "router.name";
-    public static final String ROUTER_IP = "router.ip";
-    public static final String ROUTER_GUEST_IP = "router.guest.ip";
-    public static final String ZONE_NETWORK_TYPE = "zone.network.type";
-    public static final String GUEST_BRIDGE = "guest.bridge";
-
-    protected NetworkElementCommand() {
-        super();
-    }
-
-    public void setAccessDetail(String name, String value) {
-        accessDetails.put(name, value);
-    }
-
-    public String getAccessDetail(String name) {
-        return accessDetails.get(name);
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java b/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
deleted file mode 100644
index 68d7caf..0000000
--- a/api/src/com/cloud/agent/api/routing/RemoteAccessVpnCfgCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-
-public class RemoteAccessVpnCfgCommand extends NetworkElementCommand {
-
-	boolean create;
-    String vpnServerIp;
-    String ipRange;
-    String presharedKey;
-    String localIp;
-
-    protected RemoteAccessVpnCfgCommand() {
-    	this.create = false;
-    }
-
-    public boolean isCreate() {
-		return create;
-	}
-
-	@Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-
-	public RemoteAccessVpnCfgCommand(boolean create, String vpnServerAddress, String localIp, String ipRange, String ipsecPresharedKey) {
-		this.vpnServerIp = vpnServerAddress;
-		this.ipRange  = ipRange;
-		this.presharedKey = ipsecPresharedKey;
-		this.localIp = localIp;
-		this.create = create;
-	}
-
-	public String getVpnServerIp() {
-		return vpnServerIp;
-	}
-
-	public void setVpnServerIp(String vpnServerIp) {
-		this.vpnServerIp = vpnServerIp;
-	}
-
-	public String getIpRange() {
-		return ipRange;
-	}
-
-	public void setIpRange(String ipRange) {
-		this.ipRange = ipRange;
-	}
-
-	public String getPresharedKey() {
-		return presharedKey;
-	}
-
-	public void setPresharedKey(String presharedKey) {
-		this.presharedKey = presharedKey;
-	}
-
-	public String getLocalIp() {
-		return localIp;
-	}
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java b/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
deleted file mode 100644
index 6dac148..0000000
--- a/api/src/com/cloud/agent/api/routing/SavePasswordCommand.java
+++ /dev/null
@@ -1,54 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-
-public class SavePasswordCommand extends NetworkElementCommand {
-
-    String password;
-    String vmIpAddress;
-    String vmName;
-
-    protected SavePasswordCommand() {
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return true;
-    }
-
-    public SavePasswordCommand(String password, String vmIpAddress, String vmName) {
-        this.password = password;
-        this.vmIpAddress = vmIpAddress;
-        this.vmName = vmName;
-    }
-
-	public String getPassword() {
-		return password;
-	}
-
-	public String getVmIpAddress() {
-		return vmIpAddress;
-	}
-
-    public String getVmName() {
-        return vmName;
-    }
-
-
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
deleted file mode 100644
index 5268c3d..0000000
--- a/api/src/com/cloud/agent/api/routing/SetFirewallRulesAnswer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class SetFirewallRulesAnswer extends Answer {
-    String[] results;
-
-    protected SetFirewallRulesAnswer() {
-    }
-
-    public SetFirewallRulesAnswer(SetFirewallRulesCommand cmd, boolean success, String[] results) {
-        super(cmd, success, null);
-        assert (cmd.getRules().length == results.length) : "rules and their results should be the same length don't you think?";
-        this.results = results;
-    }
-
-    public String[] getResults() {
-        return results;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
deleted file mode 100644
index 3841bd7..0000000
--- a/api/src/com/cloud/agent/api/routing/SetFirewallRulesCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.cloud.agent.api.to.FirewallRuleTO;
-
-/**
- *
- * AccessDetails allow different components to put in information about
- * how to access the components inside the command.
- */
-public class SetFirewallRulesCommand extends NetworkElementCommand {
-    FirewallRuleTO[] rules;
-
-    protected SetFirewallRulesCommand() {
-    }
-
-    public SetFirewallRulesCommand(List<FirewallRuleTO> rules) {
-        this.rules = rules.toArray(new FirewallRuleTO[rules.size()]);
-    }
-
-    public FirewallRuleTO[] getRules() {
-        return rules;
-    }
-
-	public String[][] generateFwRules() {
-		String [][] result = new String [2][];
-		Set<String> toAdd = new HashSet<String>();
-
-
-		for (FirewallRuleTO fwTO: rules) {
-		/* example  :  172.16.92.44:tcp:80:80:0.0.0.0/0:,200.16.92.44:tcp:220:220:0.0.0.0/0:,
-		 *  each entry format      <ip>:protocol:srcport:destport:scidr:
-		 *  reverted entry format  <ip>:reverted:0:0:0:
-		 */
-			if (fwTO.revoked() == true)
-			{
-				StringBuilder sb = new StringBuilder();
-				/* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
-				sb.append(fwTO.getSrcIp()).append(":reverted:0:0:0:");
-				String fwRuleEntry = sb.toString();
-				toAdd.add(fwRuleEntry);
-				continue;
-			}
-
-			List<String> cidr;
-			StringBuilder sb = new StringBuilder();
-			sb.append(fwTO.getSrcIp()).append(":").append(fwTO.getProtocol()).append(":");
-			if ("icmp".compareTo(fwTO.getProtocol()) == 0)
-			{
-				sb.append(fwTO.getIcmpType()).append(":").append(fwTO.getIcmpCode()).append(":");
-
-			}else if (fwTO.getStringSrcPortRange() == null)
-				sb.append("0:0").append(":");
-			else
-			    sb.append(fwTO.getStringSrcPortRange()).append(":");
-
-			cidr = fwTO.getSourceCidrList();
-			if (cidr == null || cidr.isEmpty())
-			{
-				sb.append("0.0.0.0/0");
-			}else{
-				Boolean firstEntry = true;
-	            for (String tag : cidr) {
-	            	if (!firstEntry) sb.append("-");
-	        	   sb.append(tag);
-	        	   firstEntry = false;
-	            }
-			}
-			sb.append(":");
-			String fwRuleEntry = sb.toString();
-
-			toAdd.add(fwRuleEntry);
-
-		}
-		result[0] = toAdd.toArray(new String[toAdd.size()]);
-
-		return result;
-	}
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
deleted file mode 100644
index dc192ad..0000000
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLAnswer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class SetNetworkACLAnswer extends Answer {
-    String[] results;
-
-    protected SetNetworkACLAnswer() {
-    }
-
-    public SetNetworkACLAnswer(SetNetworkACLCommand cmd, boolean success, String[] results) {
-        super(cmd, success, null);
-        assert (cmd.getRules().length == results.length) : "ACLs and their results should be the same length";
-        this.results = results;
-    }
-
-    public String[] getResults() {
-        return results;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java b/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
deleted file mode 100644
index dba7354..0000000
--- a/api/src/com/cloud/agent/api/routing/SetNetworkACLCommand.java
+++ /dev/null
@@ -1,97 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-
-package com.cloud.agent.api.routing;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.cloud.agent.api.to.NetworkACLTO;
-import com.cloud.agent.api.to.NicTO;
-
-public class SetNetworkACLCommand extends NetworkElementCommand{
-    NetworkACLTO[] rules;
-    NicTO nic;
-
-    protected SetNetworkACLCommand() {
-    }
-
-    public SetNetworkACLCommand(List<NetworkACLTO> rules, NicTO nic) {
-        this.rules = rules.toArray(new NetworkACLTO[rules.size()]);
-        this.nic = nic;
-    }
-
-    public NetworkACLTO[] getRules() {
-        return rules;
-    }
-    public String[][] generateFwRules() {
-        String [][] result = new String [2][];
-        Set<String> toAdd = new HashSet<String>();
-
-
-        for (NetworkACLTO aclTO: rules) {
-        /*  example  :  Ingress:tcp:80:80:0.0.0.0/0:,Egress:tcp:220:220:0.0.0.0/0:,
-         *  each entry format      Ingress/Egress:protocol:start port: end port:scidrs:
-         *  reverted entry format  Ingress/Egress:reverted:0:0:0:
-         */
-            if (aclTO.revoked() == true)
-            {
-                StringBuilder sb = new StringBuilder();
-                /* This entry is added just to make sure atleast there will one entry in the list to get the ipaddress */
-                sb.append(aclTO.getTrafficType().toString()).append(":reverted:0:0:0:");
-                String aclRuleEntry = sb.toString();
-                toAdd.add(aclRuleEntry);
-                continue;
-            }
-
-            List<String> cidr;
-            StringBuilder sb = new StringBuilder();
-            sb.append(aclTO.getTrafficType().toString()).append(":").append(aclTO.getProtocol()).append(":");
-            if ("icmp".compareTo(aclTO.getProtocol()) == 0)
-            {
-                sb.append(aclTO.getIcmpType()).append(":").append(aclTO.getIcmpCode()).append(":");
-            } else {
-                sb.append(aclTO.getStringPortRange()).append(":");
-            }
-            cidr = aclTO.getSourceCidrList();
-            if (cidr == null || cidr.isEmpty())
-            {
-                sb.append("0.0.0.0/0");
-            }else{
-                Boolean firstEntry = true;
-                for (String tag : cidr) {
-                    if (!firstEntry) sb.append("-");
-                   sb.append(tag);
-                   firstEntry = false;
-                }
-            }
-            sb.append(":");
-            String aclRuleEntry = sb.toString();
-
-            toAdd.add(aclRuleEntry);
-
-        }
-        result[0] = toAdd.toArray(new String[toAdd.size()]);
-
-        return result;
-    }
-
-    public NicTO getNic() {
-        return nic;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
deleted file mode 100644
index 15306fb..0000000
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesAnswer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class SetPortForwardingRulesAnswer extends Answer {
-    String[] results;
-    protected SetPortForwardingRulesAnswer() {
-        super();
-    }
-
-    public SetPortForwardingRulesAnswer(SetPortForwardingRulesCommand cmd, String[] results, boolean success) {
-        super(cmd, success, null);
-
-        assert(cmd.getRules().length == results.length) : "Shouldn't the results match the commands?";
-        this.results = results;
-    }
-
-    String[] getResults() {
-        return results;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
deleted file mode 100644
index a7bf37f..0000000
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import java.util.List;
-
-import com.cloud.agent.api.to.PortForwardingRuleTO;
-
-public class SetPortForwardingRulesCommand extends NetworkElementCommand {
-    PortForwardingRuleTO[] rules;
-
-    protected SetPortForwardingRulesCommand() {
-    }
-
-    public SetPortForwardingRulesCommand(List<? extends PortForwardingRuleTO> pfRules) {
-        rules = new PortForwardingRuleTO[pfRules.size()];
-        int i = 0;
-        for (PortForwardingRuleTO rule : pfRules) {
-            rules[i++] = rule;
-        }
-    }
-
-    public PortForwardingRuleTO[] getRules() {
-        return rules;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java b/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
deleted file mode 100644
index 7228457..0000000
--- a/api/src/com/cloud/agent/api/routing/SetPortForwardingRulesVpcCommand.java
+++ /dev/null
@@ -1,30 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import java.util.List;
-
-import com.cloud.agent.api.to.PortForwardingRuleTO;
-
-public class SetPortForwardingRulesVpcCommand extends SetPortForwardingRulesCommand{
-    protected SetPortForwardingRulesVpcCommand() {
-    }
-
-    public SetPortForwardingRulesVpcCommand(List<? extends PortForwardingRuleTO> pfRules) {
-        super(pfRules);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java b/api/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
deleted file mode 100644
index 655f363..0000000
--- a/api/src/com/cloud/agent/api/routing/SetSourceNatAnswer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class SetSourceNatAnswer extends Answer{
-    public SetSourceNatAnswer() {}
-
-    public SetSourceNatAnswer(SetSourceNatCommand cmd, boolean success, String result) {
-        super(cmd, success, result);
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java b/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
deleted file mode 100644
index 96aa001..0000000
--- a/api/src/com/cloud/agent/api/routing/SetSourceNatCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.to.IpAddressTO;
-
-public class SetSourceNatCommand extends NetworkElementCommand{
-    IpAddressTO ipAddress;
-    boolean add;
-
-    protected SetSourceNatCommand() {
-    }
-
-    public SetSourceNatCommand(IpAddressTO ip, boolean add) {
-        this.ipAddress = ip;
-        this.add = add;
-    }
-
-    @Override
-    public boolean executeInSequence() {
-        return false;
-    }
-
-    public IpAddressTO getIpAddress() {
-        return ipAddress;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java b/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
deleted file mode 100644
index 9b5d09b..0000000
--- a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesAnswer.java
+++ /dev/null
@@ -1,37 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class SetStaticNatRulesAnswer extends Answer {
-    String[] results;
-    protected SetStaticNatRulesAnswer() {
-        super();
-    }
-
-    public SetStaticNatRulesAnswer(SetStaticNatRulesCommand cmd, String[] results, boolean success) {
-        super(cmd, success, null);
-
-        assert(cmd.getRules().length == results.length) : "Shouldn't the results match the commands?";
-        this.results = results;
-    }
-
-    String[] getResults() {
-        return results;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java b/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
deleted file mode 100644
index 852d161..0000000
--- a/api/src/com/cloud/agent/api/routing/SetStaticNatRulesCommand.java
+++ /dev/null
@@ -1,47 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import java.util.List;
-
-import com.cloud.agent.api.to.StaticNatRuleTO;
-
-public class SetStaticNatRulesCommand extends NetworkElementCommand{
-
-    StaticNatRuleTO[] rules;
-    Long vpcId;
-
-    protected SetStaticNatRulesCommand() {
-    }
-
-    public SetStaticNatRulesCommand(List<? extends StaticNatRuleTO> staticNatRules, Long vpcId) {
-        rules = new StaticNatRuleTO[staticNatRules.size()];
-        int i = 0;
-        for (StaticNatRuleTO rule : staticNatRules) {
-            rules[i++] = rule;
-        }
-        this.vpcId = vpcId;
-    }
-
-    public StaticNatRuleTO[] getRules() {
-        return rules;
-    }
-
-    public Long getVpcId() {
-        return vpcId;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java b/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
deleted file mode 100644
index 76f5bb9..0000000
--- a/api/src/com/cloud/agent/api/routing/SetStaticRouteAnswer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-package com.cloud.agent.api.routing;
-
-import com.cloud.agent.api.Answer;
-
-public class SetStaticRouteAnswer extends Answer{
-    String[] results;
-
-    protected SetStaticRouteAnswer() {
-    }
-
-    public SetStaticRouteAnswer(SetStaticRouteCommand cmd, boolean success, String[] results) {
-        super(cmd, success, null);
-        assert (cmd.getStaticRoutes().length == results.length) : "Static routes and their results should be the same length";
-        this.results = results;
-    }
-
-    public String[] getResults() {
-        return results;
-    }
-}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c11dbad9/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java b/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
deleted file mode 100644
index c9c2056..0000000
--- a/api/src/com/cloud/agent/api/routing/SetStaticRouteCommand.java
+++ /dev/null
@@ -1,62 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.
-
-package com.cloud.agent.api.routing;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.cloud.network.vpc.StaticRoute;
-import com.cloud.network.vpc.StaticRouteProfile;
-import com.cloud.utils.net.NetUtils;
-
-public class SetStaticRouteCommand extends NetworkElementCommand{
-    StaticRouteProfile[] staticRoutes;
-
-    protected SetStaticRouteCommand() {
-    }
-
-    public SetStaticRouteCommand(List<StaticRouteProfile> staticRoutes) {
-        this.staticRoutes = staticRoutes.toArray(new StaticRouteProfile[staticRoutes.size()]);
-    }
-
-    public StaticRouteProfile[] getStaticRoutes() {
-        return staticRoutes;
-    }
-
-    public String[][] generateSRouteRules() {
-        String [][] result = new String [2][];
-        Set<String> toAdd = new HashSet<String>();
-        for (StaticRouteProfile route: staticRoutes) {
-            /*  example  :  ip:gateway:cidr,
-             */
-            String cidr = route.getCidr();
-            String subnet = NetUtils.getCidrSubNet(cidr);
-            String cidrSize = cidr.split("\\/")[1];
-            String entry;
-            if (route.getState() == StaticRoute.State.Active || route.getState() == StaticRoute.State.Add) {
-                entry = route.getIp4Address() + ":" + route.getGateway() + ":" + subnet + "/" + cidrSize;
-            } else {
-                entry = "Revoke:" + route.getGateway() + ":" + subnet + "/" + cidrSize;
-            }
-            toAdd.add(entry);
-        }
-        result[0] = toAdd.toArray(new String[toAdd.size()]);
-        return result;
-    }
-}


Mime
View raw message