Skip to content

Commit 9b17a87

Browse files
RobThreeRobThree
committed
Rename IPNetworkhelper to Networkhelper for easier access / namespace conflict.
1 parent 5cd2756 commit 9b17a87

3 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎IPNetworkHelper.Tests/IPNetworkHelperTests.cs‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,62 +11,62 @@ public class IPNetworkHelperTests
1111
[TestMethod]
1212
public void TryParseCIDRIPv4()
1313
{
14-
Assert.IsTrue(IPNetworkHelper.TryParse("192.168.0.0/24", out var network));
14+
Assert.IsTrue(NetworkHelper.TryParse("192.168.0.0/24", out var network));
1515
Assert.AreEqual(24, network.PrefixLength);
1616
Assert.IsTrue(IPAddress.Parse("192.168.0.0").Equals(network.Prefix));
1717
}
1818

1919
[TestMethod]
2020
public void TryParseCIDRIPv6()
2121
{
22-
Assert.IsTrue(IPNetworkHelper.TryParse("DEAD:BEEF:0:1234::/64", out var network));
22+
Assert.IsTrue(NetworkHelper.TryParse("DEAD:BEEF:0:1234::/64", out var network));
2323
Assert.AreEqual(64, network.PrefixLength);
2424
Assert.IsTrue(IPAddress.Parse("DEAD:BEEF:0:1234::").Equals(network.Prefix));
2525
}
2626

2727
[TestMethod]
2828
public void TryParsePrefixMustBeNetworkIPv4()
2929
{
30-
Assert.IsFalse(IPNetworkHelper.TryParse("192.168.0.150/24", out var _));
31-
Assert.IsTrue(IPNetworkHelper.TryParse("192.168.0.0/24", out var _));
30+
Assert.IsFalse(NetworkHelper.TryParse("192.168.0.150/24", out var _));
31+
Assert.IsTrue(NetworkHelper.TryParse("192.168.0.0/24", out var _));
3232
}
3333

3434
[TestMethod]
3535
public void TryParsePrefixMustBeNetworkIPv6()
3636
{
37-
Assert.IsFalse(IPNetworkHelper.TryParse("DEAD:BEEF:0:1234::FF00/64", out var _));
38-
Assert.IsTrue(IPNetworkHelper.TryParse("DEAD:BEEF:0:1234::/64", out var _));
37+
Assert.IsFalse(NetworkHelper.TryParse("DEAD:BEEF:0:1234::FF00/64", out var _));
38+
Assert.IsTrue(NetworkHelper.TryParse("DEAD:BEEF:0:1234::/64", out var _));
3939
}
4040

4141
[TestMethod]
4242
public void TryParsePrefixLengthMustBeValid()
4343
{
44-
Assert.IsFalse(IPNetworkHelper.TryParse("192.168.0.0/33", out var _)); // Should fail, max is 32
45-
Assert.IsFalse(IPNetworkHelper.TryParse("0.0.0.0/-1", out var _)); // Should fail, min is 0
44+
Assert.IsFalse(NetworkHelper.TryParse("192.168.0.0/33", out var _)); // Should fail, max is 32
45+
Assert.IsFalse(NetworkHelper.TryParse("0.0.0.0/-1", out var _)); // Should fail, min is 0
4646

47-
Assert.IsFalse(IPNetworkHelper.TryParse("DEAD:BEEF:0:1234::/129", out var _)); // Should fail, max is 128
48-
Assert.IsFalse(IPNetworkHelper.TryParse("0::0/-1", out var _)); // Should fail, min is 0
47+
Assert.IsFalse(NetworkHelper.TryParse("DEAD:BEEF:0:1234::/129", out var _)); // Should fail, max is 128
48+
Assert.IsFalse(NetworkHelper.TryParse("0::0/-1", out var _)); // Should fail, min is 0
4949

5050
// These should all pass since they're at the limits (min/max)
51-
Assert.IsTrue(IPNetworkHelper.TryParse("192.168.0.0/32", out var _));
52-
Assert.IsTrue(IPNetworkHelper.TryParse("0.0.0.0/0", out var _));
51+
Assert.IsTrue(NetworkHelper.TryParse("192.168.0.0/32", out var _));
52+
Assert.IsTrue(NetworkHelper.TryParse("0.0.0.0/0", out var _));
5353

54-
Assert.IsTrue(IPNetworkHelper.TryParse("DEAD:BEEF:0:0:1234:5678:90AB:CDEF/128", out var _));
55-
Assert.IsTrue(IPNetworkHelper.TryParse("0::0/0", out var _));
54+
Assert.IsTrue(NetworkHelper.TryParse("DEAD:BEEF:0:0:1234:5678:90AB:CDEF/128", out var _));
55+
Assert.IsTrue(NetworkHelper.TryParse("0::0/0", out var _));
5656
}
5757

5858
[TestMethod]
5959
public void TryParseHandlesNullEmptyAndInvalidValues()
6060
{
61-
Assert.IsFalse(IPNetworkHelper.TryParse(null, out var _));
62-
Assert.IsFalse(IPNetworkHelper.TryParse(string.Empty, out var _));
63-
Assert.IsFalse(IPNetworkHelper.TryParse("invalid", out var _));
61+
Assert.IsFalse(NetworkHelper.TryParse(null, out var _));
62+
Assert.IsFalse(NetworkHelper.TryParse(string.Empty, out var _));
63+
Assert.IsFalse(NetworkHelper.TryParse("invalid", out var _));
6464
}
6565

6666
[TestMethod]
6767
public void SplitIPv4()
6868
{
69-
var network = IPNetworkHelper.Parse("192.168.0.0/24");
69+
var network = NetworkHelper.Parse("192.168.0.0/24");
7070
var (left, right) = network.Split();
7171

7272
Assert.IsTrue(IPAddress.Parse("192.168.0.0").Equals(left.Prefix));
@@ -78,7 +78,7 @@ public void SplitIPv4()
7878
[TestMethod]
7979
public void SplitIPv6()
8080
{
81-
var network = IPNetworkHelper.Parse("DEAD:BEEF:0:1234::/64");
81+
var network = NetworkHelper.Parse("DEAD:BEEF:0:1234::/64");
8282
var (left, right) = network.Split();
8383

8484
Assert.IsTrue(IPAddress.Parse("DEAD:BEEF:0:1234::0").Equals(left.Prefix));
@@ -91,15 +91,15 @@ public void SplitIPv6()
9191
[ExpectedException(typeof(UnableToSplitIPNetworkException))]
9292
public void SplitThrowsOnUnsplittableNetworkIPv4()
9393
{
94-
var network = IPNetworkHelper.Parse("192.168.0.0/32");
94+
var network = NetworkHelper.Parse("192.168.0.0/32");
9595
network.Split();
9696
}
9797

9898
[TestMethod]
9999
[ExpectedException(typeof(UnableToSplitIPNetworkException))]
100100
public void SplitThrowsOnUnsplittableNetworkIPv6()
101101
{
102-
var network = IPNetworkHelper.Parse("DEAD:BEEF:0:0:1234:5678:90AB:CDEF/128");
102+
var network = NetworkHelper.Parse("DEAD:BEEF:0:0:1234:5678:90AB:CDEF/128");
103103
network.Split();
104104
}
105105

@@ -108,8 +108,8 @@ public void SplitThrowsOnUnsplittableNetworkIPv6()
108108
[ExpectedException(typeof(AddressFamilyMismatchException))]
109109
public void ExtractThrowsOnAddressFamilyMismatch()
110110
{
111-
var ipv4 = IPNetworkHelper.Parse("192.168.0.0/24");
112-
var ipv6 = IPNetworkHelper.Parse("DEAD:BEEF:0:1234::/64");
111+
var ipv4 = NetworkHelper.Parse("192.168.0.0/24");
112+
var ipv6 = NetworkHelper.Parse("DEAD:BEEF:0:1234::/64");
113113

114114
ipv4.Extract(ipv6).ToArray();
115115
}
@@ -118,8 +118,8 @@ public void ExtractThrowsOnAddressFamilyMismatch()
118118
[ExpectedException(typeof(IPNetworkLargerThanIPNetworkException))]
119119
public void ExtractThrowsOnLargerNetwork()
120120
{
121-
var network = IPNetworkHelper.Parse("192.168.0.0/24");
122-
var biggernetwork = IPNetworkHelper.Parse("192.168.0.0/23");
121+
var network = NetworkHelper.Parse("192.168.0.0/24");
122+
var biggernetwork = NetworkHelper.Parse("192.168.0.0/23");
123123

124124
network.Extract(biggernetwork).ToArray();
125125
}
@@ -128,32 +128,32 @@ public void ExtractThrowsOnLargerNetwork()
128128
[ExpectedException(typeof(IPNetworkNotInIPNetworkException))]
129129
public void ExtractThrowsOnDifferentNetwork()
130130
{
131-
var network = IPNetworkHelper.Parse("192.168.0.0/24");
132-
var different = IPNetworkHelper.Parse("172.16.0.0/30");
131+
var network = NetworkHelper.Parse("192.168.0.0/24");
132+
var different = NetworkHelper.Parse("172.16.0.0/30");
133133

134134
network.Extract(different).ToArray();
135135
}
136136

137137
[TestMethod]
138138
public void ExtractIPv4()
139139
{
140-
var network = IPNetworkHelper.Parse("192.168.0.0/16");
141-
var desired = IPNetworkHelper.Parse("192.168.16.16/28");
140+
var network = NetworkHelper.Parse("192.168.0.0/16");
141+
var desired = NetworkHelper.Parse("192.168.16.16/28");
142142

143143
var result = network.Extract(desired).ToArray();
144-
var expected = new[] { "192.168.0.0/20", "192.168.16.0/28", "192.168.16.16/28", "192.168.16.32/27", "192.168.16.64/26", "192.168.16.128/25", "192.168.17.0/24", "192.168.18.0/23", "192.168.20.0/22", "192.168.24.0/21", "192.168.32.0/19", "192.168.64.0/18", "192.168.128.0/17" }.Select(v => IPNetworkHelper.Parse(v)).ToArray();
144+
var expected = new[] { "192.168.0.0/20", "192.168.16.0/28", "192.168.16.16/28", "192.168.16.32/27", "192.168.16.64/26", "192.168.16.128/25", "192.168.17.0/24", "192.168.18.0/23", "192.168.20.0/22", "192.168.24.0/21", "192.168.32.0/19", "192.168.64.0/18", "192.168.128.0/17" }.Select(v => NetworkHelper.Parse(v)).ToArray();
145145

146146
Assert.IsTrue(result.Select((n, i) => expected[i].Equals(n)).All(v => true));
147147
}
148148

149149
[TestMethod]
150150
public void ExtractIPv6()
151151
{
152-
var network = IPNetworkHelper.Parse("1111:2222::/32");
153-
var desired = IPNetworkHelper.Parse("1111:2222:3333:8840::/64");
152+
var network = NetworkHelper.Parse("1111:2222::/32");
153+
var desired = NetworkHelper.Parse("1111:2222:3333:8840::/64");
154154

155155
var result = network.Extract(desired).ToArray();
156-
var expected = new[] { "1111:2222::/35", "1111:2222:2000::/36", "1111:2222:3000::/39", "1111:2222:3200::/40", "1111:2222:3300::/43", "1111:2222:3320::/44", "1111:2222:3330::/47", "1111:2222:3332::/48", "1111:2222:3333::/49", "1111:2222:3333:8000::/53", "1111:2222:3333:8800::/58", "1111:2222:3333:8840::/64", "1111:2222:3333:8841::/64", "1111:2222:3333:8842::/63", "1111:2222:3333:8844::/62", "1111:2222:3333:8848::/61", "1111:2222:3333:8850::/60", "1111:2222:3333:8860::/59", "1111:2222:3333:8880::/57", "1111:2222:3333:8900::/56", "1111:2222:3333:8a00::/55", "1111:2222:3333:8c00::/54", "1111:2222:3333:9000::/52", "1111:2222:3333:a000::/51", "1111:2222:3333:c000::/50", "1111:2222:3334::/46", "1111:2222:3338::/45", "1111:2222:3340::/42", "1111:2222:3380::/41", "1111:2222:3400::/38", "1111:2222:3800::/37", "1111:2222:4000::/34", "1111:2222:8000::/33" }.Select(v => IPNetworkHelper.Parse(v)).ToArray();
156+
var expected = new[] { "1111:2222::/35", "1111:2222:2000::/36", "1111:2222:3000::/39", "1111:2222:3200::/40", "1111:2222:3300::/43", "1111:2222:3320::/44", "1111:2222:3330::/47", "1111:2222:3332::/48", "1111:2222:3333::/49", "1111:2222:3333:8000::/53", "1111:2222:3333:8800::/58", "1111:2222:3333:8840::/64", "1111:2222:3333:8841::/64", "1111:2222:3333:8842::/63", "1111:2222:3333:8844::/62", "1111:2222:3333:8848::/61", "1111:2222:3333:8850::/60", "1111:2222:3333:8860::/59", "1111:2222:3333:8880::/57", "1111:2222:3333:8900::/56", "1111:2222:3333:8a00::/55", "1111:2222:3333:8c00::/54", "1111:2222:3333:9000::/52", "1111:2222:3333:a000::/51", "1111:2222:3333:c000::/50", "1111:2222:3334::/46", "1111:2222:3338::/45", "1111:2222:3340::/42", "1111:2222:3380::/41", "1111:2222:3400::/38", "1111:2222:3800::/37", "1111:2222:4000::/34", "1111:2222:8000::/33" }.Select(v => NetworkHelper.Parse(v)).ToArray();
157157

158158
Assert.IsTrue(result.Select((n, i) => expected[i].Equals(n)).All(v => true));
159159
}
@@ -165,8 +165,8 @@ public void HasValidPrefix()
165165
var n1 = new IPNetwork(ip, 28);
166166
var n2 = new IPNetwork(ip, 27);
167167

168-
Assert.IsTrue(IPNetworkHelper.HasValidPrefix(n1));
169-
Assert.IsFalse(IPNetworkHelper.HasValidPrefix(n2));
168+
Assert.IsTrue(NetworkHelper.HasValidPrefix(n1));
169+
Assert.IsFalse(NetworkHelper.HasValidPrefix(n2));
170170
}
171171
}
172172
}

‎IPNetworkHelper/IPNetworkHelper.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<RepositoryUrl>https://github.com/RobThree/IPNetworkHelper</RepositoryUrl>
1616
<RepositoryType>git</RepositoryType>
1717
<PackageTags>networking, csharp, ipv6, dotnet, network, ipv4, ip, cidr, extension-methods, dotnet-standard, ipv6-network, cidr-notation, ipv6-subnetting, ipv4-subnetting, ipv4-network, cidr-subnet</PackageTags>
18-
<PackageReleaseNotes>Fix /0 subnet bug.</PackageReleaseNotes>
19-
<Version>1.0.1</Version>
18+
<PackageReleaseNotes>Rename IPNetworkhelper to Networkhelper for easier access / namespace conflict.</PackageReleaseNotes>
19+
<Version>1.0.2</Version>
2020
</PropertyGroup>
2121

2222
<ItemGroup>

IPNetworkHelper/IPNetworkHelper.cs renamed to IPNetworkHelper/NetworkHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace IPNetworkHelper
1010
{
11-
public static class IPNetworkHelper
11+
public static class NetworkHelper
1212
{
1313
public static IPNetwork Parse(string value)
1414
{

0 commit comments

Comments
 (0)