Merge branch 'v1.1.x' into v1.2.x

gomorpheus · Nov 27, 2024 · 3158681 · 3158681
2 parents 6bafb7a + 56a6a6f
commit 3158681
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/morpheus-plugin-api/src/main/java/com/morpheusdata/core/util/NetworkUtility.java b/morpheus-plugin-api/src/main/java/com/morpheusdata/core/util/NetworkUtility.java
@@ -266,6 +266,17 @@ static public String addressToCidr(String address) {
 		return rtn;
 	}
 
+	// get the cidr from an IPV6 address
+	static public String addressToCidrIPv6(String address) {
+		String rtn = null;
+		if(address != null && address.indexOf('/') > -1) {
+			inet.ipaddr.IPAddress subnetIpAddress = new inet.ipaddr.IPAddressString(address).getAddress();
+			rtn = subnetIpAddress.toPrefixBlock().toString();
+		}
+
+		return rtn;
+	}
+
 	static public String addressToSubnet(String address) {
 		String rtn = null;
 		if (address != null && address.indexOf('/') > -1) {

diff --git a/morpheus-plugin-api/src/main/java/com/morpheusdata/model/ComputeServer.java b/morpheus-plugin-api/src/main/java/com/morpheusdata/model/ComputeServer.java
@@ -147,6 +147,7 @@ public class ComputeServer extends ComputeServerIdentityProjection {
 	protected String cloudConfigMeta;
 	protected String cloudConfigNetwork;
 	protected Boolean discovered;
+	protected String iScsiInitiatorName;
 	protected Date dateCreated;
 	protected Date lastUpdated;
 
@@ -482,6 +483,14 @@ public void setRegion(CloudRegion region) {
 		this.region = region;
 	}
 
+	public String getiScsiInitiatorName() {
+		return iScsiInitiatorName;
+	}
+
+	public void setiScsiInitiatorName(String iScsiInitiatorName) {
+		this.iScsiInitiatorName = iScsiInitiatorName;
+	}
+
 	public enum PowerState {
 		on,
 		off,