You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/12 14:09:25 UTC
[5/5] git commit: updated refs/heads/4.4 to 70a3e58
CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in VR/VpcVR to configure VPC entities fixed windows line ending issues
Conflicts:
plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/WmiCallsV2.cs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/70a3e581
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/70a3e581
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/70a3e581
Branch: refs/heads/4.4
Commit: 70a3e581ee5939b524778d52f52c13760aaed6c3
Parents: 5ead629
Author: Rajesh Battala <ra...@citrix.com>
Authored: Mon May 5 12:55:59 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon May 12 14:08:31 2014 +0200
----------------------------------------------------------------------
.../com/cloud/agent/api/GetVmConfigAnswer.java | 7 +-
.../agent/api/ModifyVmNicConfigCommand.java | 17 +
.../HypervResource/CloudStackTypes.cs | 13 +-
.../HypervResource/HypervResourceController.cs | 4690 +++++++--------
.../HypervResource/IWmiCallsV2.cs | 150 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 5498 +++++++++---------
.../resource/HypervDirectConnectResource.java | 51 +-
7 files changed, 5348 insertions(+), 5078 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70a3e581/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/GetVmConfigAnswer.java b/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
index 46e003e..e0d1536 100644
--- a/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
+++ b/core/src/com/cloud/agent/api/GetVmConfigAnswer.java
@@ -42,13 +42,15 @@ public class GetVmConfigAnswer extends Answer {
public class NicDetails {
String macAddress;
int vlanid;
+ boolean state;
public NicDetails() {
}
- public NicDetails(String macAddress, int vlanid) {
+ public NicDetails(String macAddress, int vlanid, boolean state) {
this.macAddress = macAddress;
this.vlanid = vlanid;
+ this.state = state;
}
public String getMacAddress() {
@@ -59,6 +61,9 @@ public class GetVmConfigAnswer extends Answer {
return vlanid;
}
+ public boolean getState() {
+ return state;
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70a3e581/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
----------------------------------------------------------------------
diff --git a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
index 5f4f0e1..54c0eb0 100644
--- a/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
+++ b/core/src/com/cloud/agent/api/ModifyVmNicConfigCommand.java
@@ -22,6 +22,9 @@ public class ModifyVmNicConfigCommand extends Command {
int vlan;
String macAddress;
int index;
+ boolean enable;
+ String switchLableName;
+
protected ModifyVmNicConfigCommand() {
}
@@ -37,10 +40,24 @@ public class ModifyVmNicConfigCommand extends Command {
this.index = position;
}
+ public ModifyVmNicConfigCommand(String vmName, int vlan, int position, boolean enable) {
+ this.vmName = vmName;
+ this.vlan = vlan;
+ this.index = position;
+ this.enable = enable;
+ }
+
public String getVmName() {
return vmName;
}
+ public String getSwitchLableName() {
+ return switchLableName;
+ }
+
+ public void setSwitchLableName(String switchlableName) {
+ this.switchLableName = switchlableName;
+ }
@Override
public boolean executeInSequence() {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70a3e581/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
index c222102..ef24c79 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/HypervResource/CloudStackTypes.cs
@@ -711,11 +711,22 @@ namespace HypervResource
public string macaddress;
[JsonProperty("vlanid")]
public int vlanid;
+ [JsonProperty("state")]
+ public bool state;
public NicDetails() { }
- public NicDetails(String macaddress, int vlanid)
+ public NicDetails(String macaddress, int vlanid, int enabledState)
{
this.macaddress = macaddress;
this.vlanid = vlanid;
+ if (enabledState == 2)
+ {
+ this.state = true;
+ }
+ else
+ {
+ this.state = false;
+ }
+
}
}