Renaming DHCP* to Dhcp* to follow ONOS conventions.
Change-Id: I36cfbe5b57e342af2e436e31374f1a1f49633e78
Showing
18 changed files
with
97 additions
and
97 deletions
... | @@ -23,14 +23,14 @@ import java.util.Map; | ... | @@ -23,14 +23,14 @@ import java.util.Map; |
23 | /** | 23 | /** |
24 | * DHCP Service Interface. | 24 | * DHCP Service Interface. |
25 | */ | 25 | */ |
26 | -public interface DHCPService { | 26 | +public interface DhcpService { |
27 | 27 | ||
28 | /** | 28 | /** |
29 | * Returns a collection of all the MacAddress to IPAddress mapping. | 29 | * Returns a collection of all the MacAddress to IPAddress mapping. |
30 | * | 30 | * |
31 | * @return collection of mappings. | 31 | * @return collection of mappings. |
32 | */ | 32 | */ |
33 | - Map<MacAddress, IPAssignment> listMapping(); | 33 | + Map<MacAddress, IpAssignment> listMapping(); |
34 | 34 | ||
35 | /** | 35 | /** |
36 | * Returns the default lease time granted by the DHCP Server. | 36 | * Returns the default lease time granted by the DHCP Server. | ... | ... |
... | @@ -23,7 +23,7 @@ import java.util.Map; | ... | @@ -23,7 +23,7 @@ import java.util.Map; |
23 | /** | 23 | /** |
24 | * DHCPStore Interface. | 24 | * DHCPStore Interface. |
25 | */ | 25 | */ |
26 | -public interface DHCPStore { | 26 | +public interface DhcpStore { |
27 | 27 | ||
28 | /** | 28 | /** |
29 | * Appends all the IPs in a given range to the free pool of IPs. | 29 | * Appends all the IPs in a given range to the free pool of IPs. |
... | @@ -77,7 +77,7 @@ public interface DHCPStore { | ... | @@ -77,7 +77,7 @@ public interface DHCPStore { |
77 | * | 77 | * |
78 | * @return the collection of the mappings | 78 | * @return the collection of the mappings |
79 | */ | 79 | */ |
80 | - Map<MacAddress, IPAssignment> listMapping(); | 80 | + Map<MacAddress, IpAssignment> listMapping(); |
81 | 81 | ||
82 | /** | 82 | /** |
83 | * Assigns the requested IP to the MAC ID (if available) for an indefinite period of time. | 83 | * Assigns the requested IP to the MAC ID (if available) for an indefinite period of time. | ... | ... |
... | @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull; | ... | @@ -25,7 +25,7 @@ import static com.google.common.base.Preconditions.checkNotNull; |
25 | /** | 25 | /** |
26 | * Stores the MAC ID to IP Address mapping details. | 26 | * Stores the MAC ID to IP Address mapping details. |
27 | */ | 27 | */ |
28 | -public final class IPAssignment { | 28 | +public final class IpAssignment { |
29 | 29 | ||
30 | private final Ip4Address ipAddress; | 30 | private final Ip4Address ipAddress; |
31 | 31 | ||
... | @@ -60,7 +60,7 @@ public final class IPAssignment { | ... | @@ -60,7 +60,7 @@ public final class IPAssignment { |
60 | * @param leasePeriod | 60 | * @param leasePeriod |
61 | * @param assignmentStatus | 61 | * @param assignmentStatus |
62 | */ | 62 | */ |
63 | - private IPAssignment(Ip4Address ipAddress, | 63 | + private IpAssignment(Ip4Address ipAddress, |
64 | long leasePeriod, | 64 | long leasePeriod, |
65 | Date timestamp, | 65 | Date timestamp, |
66 | AssignmentStatus assignmentStatus) { | 66 | AssignmentStatus assignmentStatus) { |
... | @@ -130,7 +130,7 @@ public final class IPAssignment { | ... | @@ -130,7 +130,7 @@ public final class IPAssignment { |
130 | * | 130 | * |
131 | * @return new builder | 131 | * @return new builder |
132 | */ | 132 | */ |
133 | - public static Builder builder(IPAssignment assignment) { | 133 | + public static Builder builder(IpAssignment assignment) { |
134 | return new Builder(assignment); | 134 | return new Builder(assignment); |
135 | } | 135 | } |
136 | 136 | ||
... | @@ -151,16 +151,16 @@ public final class IPAssignment { | ... | @@ -151,16 +151,16 @@ public final class IPAssignment { |
151 | 151 | ||
152 | } | 152 | } |
153 | 153 | ||
154 | - private Builder(IPAssignment ipAssignment) { | 154 | + private Builder(IpAssignment ipAssignment) { |
155 | ipAddress = ipAssignment.ipAddress(); | 155 | ipAddress = ipAssignment.ipAddress(); |
156 | timeStamp = ipAssignment.timestamp(); | 156 | timeStamp = ipAssignment.timestamp(); |
157 | leasePeriod = ipAssignment.leasePeriod() * 1000; | 157 | leasePeriod = ipAssignment.leasePeriod() * 1000; |
158 | assignmentStatus = ipAssignment.assignmentStatus(); | 158 | assignmentStatus = ipAssignment.assignmentStatus(); |
159 | } | 159 | } |
160 | 160 | ||
161 | - public IPAssignment build() { | 161 | + public IpAssignment build() { |
162 | validateInputs(); | 162 | validateInputs(); |
163 | - return new IPAssignment(ipAddress, | 163 | + return new IpAssignment(ipAddress, |
164 | leasePeriod, | 164 | leasePeriod, |
165 | timeStamp, | 165 | timeStamp, |
166 | assignmentStatus); | 166 | assignmentStatus); | ... | ... |
... | @@ -17,21 +17,21 @@ package org.onosproject.dhcp.cli; | ... | @@ -17,21 +17,21 @@ package org.onosproject.dhcp.cli; |
17 | 17 | ||
18 | import org.apache.karaf.shell.commands.Command; | 18 | import org.apache.karaf.shell.commands.Command; |
19 | import org.onosproject.cli.AbstractShellCommand; | 19 | import org.onosproject.cli.AbstractShellCommand; |
20 | -import org.onosproject.dhcp.DHCPService; | 20 | +import org.onosproject.dhcp.DhcpService; |
21 | 21 | ||
22 | /** | 22 | /** |
23 | * Lists all the default lease parameters offered by the DHCP Server. | 23 | * Lists all the default lease parameters offered by the DHCP Server. |
24 | */ | 24 | */ |
25 | @Command(scope = "onos", name = "dhcp-lease", | 25 | @Command(scope = "onos", name = "dhcp-lease", |
26 | description = "Lists all the default lease parameters offered by the DHCP Server") | 26 | description = "Lists all the default lease parameters offered by the DHCP Server") |
27 | -public class DHCPLeaseDetails extends AbstractShellCommand { | 27 | +public class DhcpLeaseDetails extends AbstractShellCommand { |
28 | 28 | ||
29 | private static final String DHCP_LEASE_FORMAT = "Lease Time: %ds\nRenewal Time: %ds\nRebinding Time: %ds"; | 29 | private static final String DHCP_LEASE_FORMAT = "Lease Time: %ds\nRenewal Time: %ds\nRebinding Time: %ds"; |
30 | 30 | ||
31 | @Override | 31 | @Override |
32 | protected void execute() { | 32 | protected void execute() { |
33 | 33 | ||
34 | - DHCPService dhcpService = AbstractShellCommand.get(DHCPService.class); | 34 | + DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class); |
35 | int leaseTime = dhcpService.getLeaseTime(); | 35 | int leaseTime = dhcpService.getLeaseTime(); |
36 | int renewTime = dhcpService.getRenewalTime(); | 36 | int renewTime = dhcpService.getRenewalTime(); |
37 | int rebindTime = dhcpService.getRebindingTime(); | 37 | int rebindTime = dhcpService.getRebindingTime(); | ... | ... |
... | @@ -18,8 +18,8 @@ package org.onosproject.dhcp.cli; | ... | @@ -18,8 +18,8 @@ package org.onosproject.dhcp.cli; |
18 | import org.apache.karaf.shell.commands.Command; | 18 | import org.apache.karaf.shell.commands.Command; |
19 | import org.onlab.packet.MacAddress; | 19 | import org.onlab.packet.MacAddress; |
20 | import org.onosproject.cli.AbstractShellCommand; | 20 | import org.onosproject.cli.AbstractShellCommand; |
21 | -import org.onosproject.dhcp.DHCPService; | 21 | +import org.onosproject.dhcp.DhcpService; |
22 | -import org.onosproject.dhcp.IPAssignment; | 22 | +import org.onosproject.dhcp.IpAssignment; |
23 | 23 | ||
24 | import java.util.Map; | 24 | import java.util.Map; |
25 | 25 | ||
... | @@ -28,16 +28,16 @@ import java.util.Map; | ... | @@ -28,16 +28,16 @@ import java.util.Map; |
28 | */ | 28 | */ |
29 | @Command(scope = "onos", name = "dhcp-list", | 29 | @Command(scope = "onos", name = "dhcp-list", |
30 | description = "Lists all the MAC to IP mappings held by the DHCP Server") | 30 | description = "Lists all the MAC to IP mappings held by the DHCP Server") |
31 | -public class DHCPListAllMappings extends AbstractShellCommand { | 31 | +public class DhcpListAllMappings extends AbstractShellCommand { |
32 | 32 | ||
33 | private static final String DHCP_MAPPING_FORMAT = "MAC ID: %s -> IP ASSIGNED %s"; | 33 | private static final String DHCP_MAPPING_FORMAT = "MAC ID: %s -> IP ASSIGNED %s"; |
34 | @Override | 34 | @Override |
35 | protected void execute() { | 35 | protected void execute() { |
36 | 36 | ||
37 | - DHCPService dhcpService = AbstractShellCommand.get(DHCPService.class); | 37 | + DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class); |
38 | - Map<MacAddress, IPAssignment> allocationMap = dhcpService.listMapping(); | 38 | + Map<MacAddress, IpAssignment> allocationMap = dhcpService.listMapping(); |
39 | 39 | ||
40 | - for (Map.Entry<MacAddress, IPAssignment> entry : allocationMap.entrySet()) { | 40 | + for (Map.Entry<MacAddress, IpAssignment> entry : allocationMap.entrySet()) { |
41 | print(DHCP_MAPPING_FORMAT, entry.getKey().toString(), entry.getValue().ipAddress().toString()); | 41 | print(DHCP_MAPPING_FORMAT, entry.getKey().toString(), entry.getValue().ipAddress().toString()); |
42 | } | 42 | } |
43 | } | 43 | } | ... | ... |
... | @@ -19,14 +19,14 @@ import org.apache.karaf.shell.commands.Argument; | ... | @@ -19,14 +19,14 @@ import org.apache.karaf.shell.commands.Argument; |
19 | import org.apache.karaf.shell.commands.Command; | 19 | import org.apache.karaf.shell.commands.Command; |
20 | import org.onlab.packet.MacAddress; | 20 | import org.onlab.packet.MacAddress; |
21 | import org.onosproject.cli.AbstractShellCommand; | 21 | import org.onosproject.cli.AbstractShellCommand; |
22 | -import org.onosproject.dhcp.DHCPService; | 22 | +import org.onosproject.dhcp.DhcpService; |
23 | 23 | ||
24 | /** | 24 | /** |
25 | * Removes a static MAC Address to IP Mapping from the DHCP Server. | 25 | * Removes a static MAC Address to IP Mapping from the DHCP Server. |
26 | */ | 26 | */ |
27 | @Command(scope = "onos", name = "dhcp-remove-static-mapping", | 27 | @Command(scope = "onos", name = "dhcp-remove-static-mapping", |
28 | description = "Removes a static MAC Address to IP Mapping from the DHCP Server") | 28 | description = "Removes a static MAC Address to IP Mapping from the DHCP Server") |
29 | -public class DHCPRemoveStaticMapping extends AbstractShellCommand { | 29 | +public class DhcpRemoveStaticMapping extends AbstractShellCommand { |
30 | 30 | ||
31 | @Argument(index = 0, name = "macAddr", | 31 | @Argument(index = 0, name = "macAddr", |
32 | description = "MAC Address of the client", | 32 | description = "MAC Address of the client", |
... | @@ -39,7 +39,7 @@ public class DHCPRemoveStaticMapping extends AbstractShellCommand { | ... | @@ -39,7 +39,7 @@ public class DHCPRemoveStaticMapping extends AbstractShellCommand { |
39 | 39 | ||
40 | @Override | 40 | @Override |
41 | protected void execute() { | 41 | protected void execute() { |
42 | - DHCPService dhcpService = AbstractShellCommand.get(DHCPService.class); | 42 | + DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class); |
43 | 43 | ||
44 | try { | 44 | try { |
45 | MacAddress macID = MacAddress.valueOf(macAddr); | 45 | MacAddress macID = MacAddress.valueOf(macAddr); | ... | ... |
... | @@ -20,14 +20,14 @@ import org.apache.karaf.shell.commands.Command; | ... | @@ -20,14 +20,14 @@ import org.apache.karaf.shell.commands.Command; |
20 | import org.onlab.packet.Ip4Address; | 20 | import org.onlab.packet.Ip4Address; |
21 | import org.onlab.packet.MacAddress; | 21 | import org.onlab.packet.MacAddress; |
22 | import org.onosproject.cli.AbstractShellCommand; | 22 | import org.onosproject.cli.AbstractShellCommand; |
23 | -import org.onosproject.dhcp.DHCPService; | 23 | +import org.onosproject.dhcp.DhcpService; |
24 | 24 | ||
25 | /** | 25 | /** |
26 | * Registers a static MAC Address to IP Mapping with the DHCP Server. | 26 | * Registers a static MAC Address to IP Mapping with the DHCP Server. |
27 | */ | 27 | */ |
28 | @Command(scope = "onos", name = "dhcp-set-static-mapping", | 28 | @Command(scope = "onos", name = "dhcp-set-static-mapping", |
29 | description = "Registers a static MAC Address to IP Mapping with the DHCP Server") | 29 | description = "Registers a static MAC Address to IP Mapping with the DHCP Server") |
30 | -public class DHCPSetStaticMapping extends AbstractShellCommand { | 30 | +public class DhcpSetStaticMapping extends AbstractShellCommand { |
31 | 31 | ||
32 | @Argument(index = 0, name = "macAddr", | 32 | @Argument(index = 0, name = "macAddr", |
33 | description = "MAC Address of the client", | 33 | description = "MAC Address of the client", |
... | @@ -43,7 +43,7 @@ public class DHCPSetStaticMapping extends AbstractShellCommand { | ... | @@ -43,7 +43,7 @@ public class DHCPSetStaticMapping extends AbstractShellCommand { |
43 | private static final String DHCP_FAILURE = "Static Mapping Failed. The IP maybe unavailable."; | 43 | private static final String DHCP_FAILURE = "Static Mapping Failed. The IP maybe unavailable."; |
44 | @Override | 44 | @Override |
45 | protected void execute() { | 45 | protected void execute() { |
46 | - DHCPService dhcpService = AbstractShellCommand.get(DHCPService.class); | 46 | + DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class); |
47 | 47 | ||
48 | try { | 48 | try { |
49 | MacAddress macID = MacAddress.valueOf(macAddr); | 49 | MacAddress macID = MacAddress.valueOf(macAddr); | ... | ... |
... | @@ -19,7 +19,7 @@ import org.apache.karaf.shell.console.Completer; | ... | @@ -19,7 +19,7 @@ import org.apache.karaf.shell.console.Completer; |
19 | import org.apache.karaf.shell.console.completer.StringsCompleter; | 19 | import org.apache.karaf.shell.console.completer.StringsCompleter; |
20 | import org.onlab.packet.Ip4Address; | 20 | import org.onlab.packet.Ip4Address; |
21 | import org.onosproject.cli.AbstractShellCommand; | 21 | import org.onosproject.cli.AbstractShellCommand; |
22 | -import org.onosproject.dhcp.DHCPService; | 22 | +import org.onosproject.dhcp.DhcpService; |
23 | 23 | ||
24 | import java.util.Iterator; | 24 | import java.util.Iterator; |
25 | import java.util.List; | 25 | import java.util.List; |
... | @@ -28,13 +28,13 @@ import java.util.SortedSet; | ... | @@ -28,13 +28,13 @@ import java.util.SortedSet; |
28 | /** | 28 | /** |
29 | * Free IP Completer. | 29 | * Free IP Completer. |
30 | */ | 30 | */ |
31 | -public class FreeIPCompleter implements Completer { | 31 | +public class FreeIpCompleter implements Completer { |
32 | 32 | ||
33 | @Override | 33 | @Override |
34 | public int complete(String buffer, int cursor, List<String> candidates) { | 34 | public int complete(String buffer, int cursor, List<String> candidates) { |
35 | // Delegate string completer | 35 | // Delegate string completer |
36 | StringsCompleter delegate = new StringsCompleter(); | 36 | StringsCompleter delegate = new StringsCompleter(); |
37 | - DHCPService dhcpService = AbstractShellCommand.get(DHCPService.class); | 37 | + DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class); |
38 | Iterator<Ip4Address> it = dhcpService.getAvailableIPs().iterator(); | 38 | Iterator<Ip4Address> it = dhcpService.getAvailableIPs().iterator(); |
39 | SortedSet<String> strings = delegate.getStrings(); | 39 | SortedSet<String> strings = delegate.getStrings(); |
40 | 40 | ... | ... |
... | @@ -22,7 +22,7 @@ import org.onosproject.net.config.basics.BasicElementConfig; | ... | @@ -22,7 +22,7 @@ import org.onosproject.net.config.basics.BasicElementConfig; |
22 | /** | 22 | /** |
23 | * DHCP Config class. | 23 | * DHCP Config class. |
24 | */ | 24 | */ |
25 | -public class DHCPConfig extends Config<ApplicationId> { | 25 | +public class DhcpConfig extends Config<ApplicationId> { |
26 | 26 | ||
27 | public static final String MY_IP = "ip"; | 27 | public static final String MY_IP = "ip"; |
28 | public static final String MY_MAC = "mac"; | 28 | public static final String MY_MAC = "mac"; | ... | ... |
... | @@ -36,9 +36,9 @@ import org.onlab.packet.UDP; | ... | @@ -36,9 +36,9 @@ import org.onlab.packet.UDP; |
36 | import org.onlab.packet.VlanId; | 36 | import org.onlab.packet.VlanId; |
37 | import org.onosproject.core.ApplicationId; | 37 | import org.onosproject.core.ApplicationId; |
38 | import org.onosproject.core.CoreService; | 38 | import org.onosproject.core.CoreService; |
39 | -import org.onosproject.dhcp.DHCPService; | 39 | +import org.onosproject.dhcp.DhcpService; |
40 | -import org.onosproject.dhcp.DHCPStore; | 40 | +import org.onosproject.dhcp.DhcpStore; |
41 | -import org.onosproject.dhcp.IPAssignment; | 41 | +import org.onosproject.dhcp.IpAssignment; |
42 | import org.onosproject.net.config.ConfigFactory; | 42 | import org.onosproject.net.config.ConfigFactory; |
43 | import org.onosproject.net.config.NetworkConfigEvent; | 43 | import org.onosproject.net.config.NetworkConfigEvent; |
44 | import org.onosproject.net.config.NetworkConfigListener; | 44 | import org.onosproject.net.config.NetworkConfigListener; |
... | @@ -81,7 +81,7 @@ import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FAC | ... | @@ -81,7 +81,7 @@ import static org.onosproject.net.config.basics.SubjectFactories.APP_SUBJECT_FAC |
81 | */ | 81 | */ |
82 | @Component(immediate = true) | 82 | @Component(immediate = true) |
83 | @Service | 83 | @Service |
84 | -public class DHCPManager implements DHCPService { | 84 | +public class DhcpManager implements DhcpService { |
85 | 85 | ||
86 | private static final ProviderId PID = new ProviderId("of", "org.onosproject.dhcp", true); | 86 | private static final ProviderId PID = new ProviderId("of", "org.onosproject.dhcp", true); |
87 | private final Logger log = LoggerFactory.getLogger(getClass()); | 87 | private final Logger log = LoggerFactory.getLogger(getClass()); |
... | @@ -89,20 +89,20 @@ public class DHCPManager implements DHCPService { | ... | @@ -89,20 +89,20 @@ public class DHCPManager implements DHCPService { |
89 | private final NetworkConfigListener cfgListener = new InternalConfigListener(); | 89 | private final NetworkConfigListener cfgListener = new InternalConfigListener(); |
90 | 90 | ||
91 | private final Set<ConfigFactory> factories = ImmutableSet.of( | 91 | private final Set<ConfigFactory> factories = ImmutableSet.of( |
92 | - new ConfigFactory<ApplicationId, DHCPConfig>(APP_SUBJECT_FACTORY, | 92 | + new ConfigFactory<ApplicationId, DhcpConfig>(APP_SUBJECT_FACTORY, |
93 | - DHCPConfig.class, | 93 | + DhcpConfig.class, |
94 | "dhcp") { | 94 | "dhcp") { |
95 | @Override | 95 | @Override |
96 | - public DHCPConfig createConfig() { | 96 | + public DhcpConfig createConfig() { |
97 | - return new DHCPConfig(); | 97 | + return new DhcpConfig(); |
98 | } | 98 | } |
99 | }, | 99 | }, |
100 | - new ConfigFactory<ApplicationId, DHCPStoreConfig>(APP_SUBJECT_FACTORY, | 100 | + new ConfigFactory<ApplicationId, DhcpStoreConfig>(APP_SUBJECT_FACTORY, |
101 | - DHCPStoreConfig.class, | 101 | + DhcpStoreConfig.class, |
102 | "dhcpstore") { | 102 | "dhcpstore") { |
103 | @Override | 103 | @Override |
104 | - public DHCPStoreConfig createConfig() { | 104 | + public DhcpStoreConfig createConfig() { |
105 | - return new DHCPStoreConfig(); | 105 | + return new DhcpStoreConfig(); |
106 | } | 106 | } |
107 | } | 107 | } |
108 | ); | 108 | ); |
... | @@ -118,7 +118,7 @@ public class DHCPManager implements DHCPService { | ... | @@ -118,7 +118,7 @@ public class DHCPManager implements DHCPService { |
118 | protected CoreService coreService; | 118 | protected CoreService coreService; |
119 | 119 | ||
120 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) | 120 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
121 | - protected DHCPStore dhcpStore; | 121 | + protected DhcpStore dhcpStore; |
122 | 122 | ||
123 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) | 123 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
124 | protected HostProviderRegistry hostProviderRegistry; | 124 | protected HostProviderRegistry hostProviderRegistry; |
... | @@ -214,7 +214,7 @@ public class DHCPManager implements DHCPService { | ... | @@ -214,7 +214,7 @@ public class DHCPManager implements DHCPService { |
214 | } | 214 | } |
215 | 215 | ||
216 | @Override | 216 | @Override |
217 | - public Map<MacAddress, IPAssignment> listMapping() { | 217 | + public Map<MacAddress, IpAssignment> listMapping() { |
218 | return dhcpStore.listMapping(); | 218 | return dhcpStore.listMapping(); |
219 | } | 219 | } |
220 | 220 | ||
... | @@ -580,7 +580,7 @@ public class DHCPManager implements DHCPService { | ... | @@ -580,7 +580,7 @@ public class DHCPManager implements DHCPService { |
580 | * | 580 | * |
581 | * @param cfg configuration object | 581 | * @param cfg configuration object |
582 | */ | 582 | */ |
583 | - private void reconfigureNetwork(DHCPConfig cfg) { | 583 | + private void reconfigureNetwork(DhcpConfig cfg) { |
584 | 584 | ||
585 | if (cfg.ip() != null) { | 585 | if (cfg.ip() != null) { |
586 | myIP = cfg.ip(); | 586 | myIP = cfg.ip(); |
... | @@ -619,7 +619,7 @@ public class DHCPManager implements DHCPService { | ... | @@ -619,7 +619,7 @@ public class DHCPManager implements DHCPService { |
619 | * | 619 | * |
620 | * @param cfg configuration object | 620 | * @param cfg configuration object |
621 | */ | 621 | */ |
622 | - private void reconfigureStore(DHCPStoreConfig cfg) { | 622 | + private void reconfigureStore(DhcpStoreConfig cfg) { |
623 | 623 | ||
624 | if (cfg.defaultTimeout() != null) { | 624 | if (cfg.defaultTimeout() != null) { |
625 | dhcpStore.setDefaultTimeoutForPurge(Integer.valueOf(cfg.defaultTimeout())); | 625 | dhcpStore.setDefaultTimeoutForPurge(Integer.valueOf(cfg.defaultTimeout())); |
... | @@ -638,13 +638,13 @@ public class DHCPManager implements DHCPService { | ... | @@ -638,13 +638,13 @@ public class DHCPManager implements DHCPService { |
638 | 638 | ||
639 | if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED || | 639 | if ((event.type() == NetworkConfigEvent.Type.CONFIG_ADDED || |
640 | event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED)) { | 640 | event.type() == NetworkConfigEvent.Type.CONFIG_UPDATED)) { |
641 | - if (event.configClass().equals(DHCPConfig.class)) { | 641 | + if (event.configClass().equals(DhcpConfig.class)) { |
642 | - DHCPConfig cfg = cfgService.getConfig(appId, DHCPConfig.class); | 642 | + DhcpConfig cfg = cfgService.getConfig(appId, DhcpConfig.class); |
643 | reconfigureNetwork(cfg); | 643 | reconfigureNetwork(cfg); |
644 | log.info("Reconfigured Manager"); | 644 | log.info("Reconfigured Manager"); |
645 | } | 645 | } |
646 | - if (event.configClass().equals(DHCPStoreConfig.class)) { | 646 | + if (event.configClass().equals(DhcpStoreConfig.class)) { |
647 | - DHCPStoreConfig cfg = cfgService.getConfig(appId, DHCPStoreConfig.class); | 647 | + DhcpStoreConfig cfg = cfgService.getConfig(appId, DhcpStoreConfig.class); |
648 | reconfigureStore(cfg); | 648 | reconfigureStore(cfg); |
649 | log.info("Reconfigured Store"); | 649 | log.info("Reconfigured Store"); |
650 | } | 650 | } | ... | ... |
... | @@ -22,7 +22,7 @@ import org.onosproject.net.config.basics.BasicElementConfig; | ... | @@ -22,7 +22,7 @@ import org.onosproject.net.config.basics.BasicElementConfig; |
22 | /** | 22 | /** |
23 | * DHCP Store Config class. | 23 | * DHCP Store Config class. |
24 | */ | 24 | */ |
25 | -public class DHCPStoreConfig extends Config<ApplicationId> { | 25 | +public class DhcpStoreConfig extends Config<ApplicationId> { |
26 | 26 | ||
27 | public static final String TIMER_DELAY = "delay"; | 27 | public static final String TIMER_DELAY = "delay"; |
28 | public static final String DEFAULT_TIMEOUT = "timeout"; | 28 | public static final String DEFAULT_TIMEOUT = "timeout"; | ... | ... |
... | @@ -37,11 +37,11 @@ import static org.onosproject.ui.UiView.Category.NETWORK; | ... | @@ -37,11 +37,11 @@ import static org.onosproject.ui.UiView.Category.NETWORK; |
37 | * Mechanism to stream data to the GUI. | 37 | * Mechanism to stream data to the GUI. |
38 | */ | 38 | */ |
39 | @Component(immediate = true, enabled = true) | 39 | @Component(immediate = true, enabled = true) |
40 | -@Service(value = DHCPUi.class) | 40 | +@Service(value = DhcpUi.class) |
41 | -public class DHCPUi { | 41 | +public class DhcpUi { |
42 | 42 | ||
43 | private final Logger log = LoggerFactory.getLogger(getClass()); | 43 | private final Logger log = LoggerFactory.getLogger(getClass()); |
44 | - private static final ClassLoader CL = DHCPUi.class.getClassLoader(); | 44 | + private static final ClassLoader CL = DhcpUi.class.getClassLoader(); |
45 | 45 | ||
46 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) | 46 | @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) |
47 | protected UiExtensionService uiExtensionService; | 47 | protected UiExtensionService uiExtensionService; | ... | ... |
... | @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; | ... | @@ -19,8 +19,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; |
19 | import com.google.common.collect.ImmutableSet; | 19 | import com.google.common.collect.ImmutableSet; |
20 | import org.onlab.packet.MacAddress; | 20 | import org.onlab.packet.MacAddress; |
21 | import org.onosproject.cli.AbstractShellCommand; | 21 | import org.onosproject.cli.AbstractShellCommand; |
22 | -import org.onosproject.dhcp.DHCPService; | 22 | +import org.onosproject.dhcp.DhcpService; |
23 | -import org.onosproject.dhcp.IPAssignment; | 23 | +import org.onosproject.dhcp.IpAssignment; |
24 | import org.onosproject.ui.RequestHandler; | 24 | import org.onosproject.ui.RequestHandler; |
25 | import org.onosproject.ui.UiMessageHandler; | 25 | import org.onosproject.ui.UiMessageHandler; |
26 | import org.onosproject.ui.table.TableModel; | 26 | import org.onosproject.ui.table.TableModel; |
... | @@ -72,15 +72,15 @@ public class DhcpViewMessageHandler extends UiMessageHandler { | ... | @@ -72,15 +72,15 @@ public class DhcpViewMessageHandler extends UiMessageHandler { |
72 | 72 | ||
73 | @Override | 73 | @Override |
74 | protected void populateTable(TableModel tm, ObjectNode payload) { | 74 | protected void populateTable(TableModel tm, ObjectNode payload) { |
75 | - DHCPService dhcpService = AbstractShellCommand.get(DHCPService.class); | 75 | + DhcpService dhcpService = AbstractShellCommand.get(DhcpService.class); |
76 | - Map<MacAddress, IPAssignment> allocationMap = dhcpService.listMapping(); | 76 | + Map<MacAddress, IpAssignment> allocationMap = dhcpService.listMapping(); |
77 | 77 | ||
78 | - for (Map.Entry<MacAddress, IPAssignment> entry : allocationMap.entrySet()) { | 78 | + for (Map.Entry<MacAddress, IpAssignment> entry : allocationMap.entrySet()) { |
79 | populateRow(tm.addRow(), entry); | 79 | populateRow(tm.addRow(), entry); |
80 | } | 80 | } |
81 | } | 81 | } |
82 | 82 | ||
83 | - private void populateRow(TableModel.Row row, Map.Entry<MacAddress, IPAssignment> entry) { | 83 | + private void populateRow(TableModel.Row row, Map.Entry<MacAddress, IpAssignment> entry) { |
84 | if (entry.getValue().leasePeriod() > 0) { | 84 | if (entry.getValue().leasePeriod() > 0) { |
85 | Date now = new Date(entry.getValue().timestamp().getTime() + entry.getValue().leasePeriod()); | 85 | Date now = new Date(entry.getValue().timestamp().getTime() + entry.getValue().leasePeriod()); |
86 | row.cell(MAC, entry.getKey()) | 86 | row.cell(MAC, entry.getKey()) | ... | ... |
This diff is collapsed. Click to expand it.
... | @@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode; | ... | @@ -20,8 +20,8 @@ import com.fasterxml.jackson.databind.node.ArrayNode; |
20 | import com.fasterxml.jackson.databind.node.ObjectNode; | 20 | import com.fasterxml.jackson.databind.node.ObjectNode; |
21 | import org.onlab.packet.Ip4Address; | 21 | import org.onlab.packet.Ip4Address; |
22 | import org.onlab.packet.MacAddress; | 22 | import org.onlab.packet.MacAddress; |
23 | -import org.onosproject.dhcp.DHCPService; | 23 | +import org.onosproject.dhcp.DhcpService; |
24 | -import org.onosproject.dhcp.IPAssignment; | 24 | +import org.onosproject.dhcp.IpAssignment; |
25 | import org.onosproject.rest.AbstractWebResource; | 25 | import org.onosproject.rest.AbstractWebResource; |
26 | 26 | ||
27 | import javax.ws.rs.Consumes; | 27 | import javax.ws.rs.Consumes; |
... | @@ -42,7 +42,7 @@ import java.util.Map; | ... | @@ -42,7 +42,7 @@ import java.util.Map; |
42 | @Path("dhcp") | 42 | @Path("dhcp") |
43 | public class DHCPWebResource extends AbstractWebResource { | 43 | public class DHCPWebResource extends AbstractWebResource { |
44 | 44 | ||
45 | - final DHCPService service = get(DHCPService.class); | 45 | + final DhcpService service = get(DhcpService.class); |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * Get DHCP server configuration data. | 48 | * Get DHCP server configuration data. |
... | @@ -53,7 +53,7 @@ public class DHCPWebResource extends AbstractWebResource { | ... | @@ -53,7 +53,7 @@ public class DHCPWebResource extends AbstractWebResource { |
53 | @GET | 53 | @GET |
54 | @Path("config") | 54 | @Path("config") |
55 | public Response getConfigs() { | 55 | public Response getConfigs() { |
56 | - DHCPService service = get(DHCPService.class); | 56 | + DhcpService service = get(DhcpService.class); |
57 | ObjectNode node = mapper().createObjectNode() | 57 | ObjectNode node = mapper().createObjectNode() |
58 | .put("leaseTime", service.getLeaseTime()) | 58 | .put("leaseTime", service.getLeaseTime()) |
59 | .put("renewalTime", service.getRenewalTime()) | 59 | .put("renewalTime", service.getRenewalTime()) |
... | @@ -72,7 +72,7 @@ public class DHCPWebResource extends AbstractWebResource { | ... | @@ -72,7 +72,7 @@ public class DHCPWebResource extends AbstractWebResource { |
72 | public Response listMappings() { | 72 | public Response listMappings() { |
73 | ObjectNode root = mapper().createObjectNode(); | 73 | ObjectNode root = mapper().createObjectNode(); |
74 | 74 | ||
75 | - final Map<MacAddress, IPAssignment> intents = service.listMapping(); | 75 | + final Map<MacAddress, IpAssignment> intents = service.listMapping(); |
76 | ArrayNode arrayNode = root.putArray("mappings"); | 76 | ArrayNode arrayNode = root.putArray("mappings"); |
77 | intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode() | 77 | intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode() |
78 | .put("mac", i.getKey().toString()) | 78 | .put("mac", i.getKey().toString()) |
... | @@ -124,7 +124,7 @@ public class DHCPWebResource extends AbstractWebResource { | ... | @@ -124,7 +124,7 @@ public class DHCPWebResource extends AbstractWebResource { |
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | - final Map<MacAddress, IPAssignment> intents = service.listMapping(); | 127 | + final Map<MacAddress, IpAssignment> intents = service.listMapping(); |
128 | ArrayNode arrayNode = root.putArray("mappings"); | 128 | ArrayNode arrayNode = root.putArray("mappings"); |
129 | intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode() | 129 | intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode() |
130 | .put("mac", i.getKey().toString()) | 130 | .put("mac", i.getKey().toString()) |
... | @@ -150,7 +150,7 @@ public class DHCPWebResource extends AbstractWebResource { | ... | @@ -150,7 +150,7 @@ public class DHCPWebResource extends AbstractWebResource { |
150 | if (!service.removeStaticMapping(MacAddress.valueOf(macID))) { | 150 | if (!service.removeStaticMapping(MacAddress.valueOf(macID))) { |
151 | throw new IllegalArgumentException("Static Mapping Removal Failed."); | 151 | throw new IllegalArgumentException("Static Mapping Removal Failed."); |
152 | } | 152 | } |
153 | - final Map<MacAddress, IPAssignment> intents = service.listMapping(); | 153 | + final Map<MacAddress, IpAssignment> intents = service.listMapping(); |
154 | ArrayNode arrayNode = root.putArray("mappings"); | 154 | ArrayNode arrayNode = root.putArray("mappings"); |
155 | intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode() | 155 | intents.entrySet().forEach(i -> arrayNode.add(mapper().createObjectNode() |
156 | .put("mac", i.getKey().toString()) | 156 | .put("mac", i.getKey().toString()) | ... | ... |
... | @@ -17,20 +17,20 @@ | ... | @@ -17,20 +17,20 @@ |
17 | 17 | ||
18 | <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0"> | 18 | <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0"> |
19 | <command> | 19 | <command> |
20 | - <action class="org.onosproject.dhcp.cli.DHCPListAllMappings"/> | 20 | + <action class="org.onosproject.dhcp.cli.DhcpListAllMappings"/> |
21 | </command> | 21 | </command> |
22 | <command> | 22 | <command> |
23 | - <action class="org.onosproject.dhcp.cli.DHCPLeaseDetails"/> | 23 | + <action class="org.onosproject.dhcp.cli.DhcpLeaseDetails"/> |
24 | </command> | 24 | </command> |
25 | <command> | 25 | <command> |
26 | - <action class="org.onosproject.dhcp.cli.DHCPSetStaticMapping"/> | 26 | + <action class="org.onosproject.dhcp.cli.DhcpSetStaticMapping"/> |
27 | <completers> | 27 | <completers> |
28 | <ref component-id="macIDCompleter"/> | 28 | <ref component-id="macIDCompleter"/> |
29 | <ref component-id="freeIPCompleter"/> | 29 | <ref component-id="freeIPCompleter"/> |
30 | </completers> | 30 | </completers> |
31 | </command> | 31 | </command> |
32 | <command> | 32 | <command> |
33 | - <action class="org.onosproject.dhcp.cli.DHCPRemoveStaticMapping"/> | 33 | + <action class="org.onosproject.dhcp.cli.DhcpRemoveStaticMapping"/> |
34 | <completers> | 34 | <completers> |
35 | <ref component-id="macIDCompleter"/> | 35 | <ref component-id="macIDCompleter"/> |
36 | </completers> | 36 | </completers> |
... | @@ -38,6 +38,6 @@ | ... | @@ -38,6 +38,6 @@ |
38 | </command-bundle> | 38 | </command-bundle> |
39 | 39 | ||
40 | <bean id="macIDCompleter" class="org.onosproject.dhcp.cli.MacIdCompleter"/> | 40 | <bean id="macIDCompleter" class="org.onosproject.dhcp.cli.MacIdCompleter"/> |
41 | - <bean id="freeIPCompleter" class="org.onosproject.dhcp.cli.FreeIPCompleter"/> | 41 | + <bean id="freeIPCompleter" class="org.onosproject.dhcp.cli.FreeIpCompleter"/> |
42 | 42 | ||
43 | </blueprint> | 43 | </blueprint> |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -31,25 +31,25 @@ import static org.junit.Assert.fail; | ... | @@ -31,25 +31,25 @@ import static org.junit.Assert.fail; |
31 | /** | 31 | /** |
32 | * Unit Tests for IPAssignment class. | 32 | * Unit Tests for IPAssignment class. |
33 | */ | 33 | */ |
34 | -public class IPAssignmentTest extends TestCase { | 34 | +public class IpAssignmentTest extends TestCase { |
35 | 35 | ||
36 | private final Date dateNow = new Date(); | 36 | private final Date dateNow = new Date(); |
37 | 37 | ||
38 | - private final IPAssignment stats1 = IPAssignment.builder() | 38 | + private final IpAssignment stats1 = IpAssignment.builder() |
39 | .ipAddress(Ip4Address.valueOf("10.10.10.10")) | 39 | .ipAddress(Ip4Address.valueOf("10.10.10.10")) |
40 | .leasePeriod(300) | 40 | .leasePeriod(300) |
41 | - .assignmentStatus(IPAssignment.AssignmentStatus.Option_Expired) | 41 | + .assignmentStatus(IpAssignment.AssignmentStatus.Option_Expired) |
42 | .timestamp(dateNow) | 42 | .timestamp(dateNow) |
43 | .build(); | 43 | .build(); |
44 | 44 | ||
45 | - private final IPAssignment stats2 = IPAssignment.builder() | 45 | + private final IpAssignment stats2 = IpAssignment.builder() |
46 | .ipAddress(Ip4Address.valueOf("10.10.10.10")) | 46 | .ipAddress(Ip4Address.valueOf("10.10.10.10")) |
47 | .leasePeriod(300) | 47 | .leasePeriod(300) |
48 | - .assignmentStatus(IPAssignment.AssignmentStatus.Option_Assigned) | 48 | + .assignmentStatus(IpAssignment.AssignmentStatus.Option_Assigned) |
49 | .timestamp(dateNow) | 49 | .timestamp(dateNow) |
50 | .build(); | 50 | .build(); |
51 | 51 | ||
52 | - private final IPAssignment stats3 = IPAssignment.builder(stats1) | 52 | + private final IpAssignment stats3 = IpAssignment.builder(stats1) |
53 | .build(); | 53 | .build(); |
54 | 54 | ||
55 | /** | 55 | /** |
... | @@ -60,7 +60,7 @@ public class IPAssignmentTest extends TestCase { | ... | @@ -60,7 +60,7 @@ public class IPAssignmentTest extends TestCase { |
60 | assertThat(stats3.ipAddress(), is(Ip4Address.valueOf("10.10.10.10"))); | 60 | assertThat(stats3.ipAddress(), is(Ip4Address.valueOf("10.10.10.10"))); |
61 | assertThat(stats3.timestamp(), is(dateNow)); | 61 | assertThat(stats3.timestamp(), is(dateNow)); |
62 | assertThat(stats3.leasePeriod(), is(300)); | 62 | assertThat(stats3.leasePeriod(), is(300)); |
63 | - assertThat(stats3.assignmentStatus(), is(IPAssignment.AssignmentStatus.Option_Expired)); | 63 | + assertThat(stats3.assignmentStatus(), is(IpAssignment.AssignmentStatus.Option_Expired)); |
64 | } | 64 | } |
65 | 65 | ||
66 | /** | 66 | /** |
... | @@ -88,7 +88,7 @@ public class IPAssignmentTest extends TestCase { | ... | @@ -88,7 +88,7 @@ public class IPAssignmentTest extends TestCase { |
88 | @Test | 88 | @Test |
89 | public void testValidateInputs() { | 89 | public void testValidateInputs() { |
90 | try { | 90 | try { |
91 | - IPAssignment stats4 = IPAssignment.builder() | 91 | + IpAssignment stats4 = IpAssignment.builder() |
92 | .ipAddress(Ip4Address.valueOf("10.10.10.10")) | 92 | .ipAddress(Ip4Address.valueOf("10.10.10.10")) |
93 | .leasePeriod(300) | 93 | .leasePeriod(300) |
94 | .build(); | 94 | .build(); | ... | ... |
... | @@ -28,8 +28,8 @@ import org.onlab.packet.Ip4Address; | ... | @@ -28,8 +28,8 @@ import org.onlab.packet.Ip4Address; |
28 | import org.onlab.packet.MacAddress; | 28 | import org.onlab.packet.MacAddress; |
29 | import org.onlab.packet.UDP; | 29 | import org.onlab.packet.UDP; |
30 | import org.onosproject.core.CoreServiceAdapter; | 30 | import org.onosproject.core.CoreServiceAdapter; |
31 | -import org.onosproject.dhcp.DHCPStore; | 31 | +import org.onosproject.dhcp.DhcpStore; |
32 | -import org.onosproject.dhcp.IPAssignment; | 32 | +import org.onosproject.dhcp.IpAssignment; |
33 | import org.onosproject.net.Host; | 33 | import org.onosproject.net.Host; |
34 | import org.onosproject.net.HostId; | 34 | import org.onosproject.net.HostId; |
35 | import org.onosproject.net.config.NetworkConfigRegistryAdapter; | 35 | import org.onosproject.net.config.NetworkConfigRegistryAdapter; |
... | @@ -64,9 +64,9 @@ import static org.onosproject.net.NetTestTools.connectPoint; | ... | @@ -64,9 +64,9 @@ import static org.onosproject.net.NetTestTools.connectPoint; |
64 | * Set of tests of the ONOS application component. | 64 | * Set of tests of the ONOS application component. |
65 | */ | 65 | */ |
66 | 66 | ||
67 | -public class DHCPManagerTest { | 67 | +public class DhcpManagerTest { |
68 | 68 | ||
69 | - private DHCPManager dhcpManager; | 69 | + private DhcpManager dhcpXManager; |
70 | 70 | ||
71 | protected PacketProcessor packetProcessor; | 71 | protected PacketProcessor packetProcessor; |
72 | 72 | ||
... | @@ -84,20 +84,20 @@ public class DHCPManagerTest { | ... | @@ -84,20 +84,20 @@ public class DHCPManagerTest { |
84 | 84 | ||
85 | @Before | 85 | @Before |
86 | public void setUp() { | 86 | public void setUp() { |
87 | - dhcpManager = new DHCPManager(); | 87 | + dhcpXManager = new DhcpManager(); |
88 | - dhcpManager.cfgService = new TestNetworkConfigRegistry(); | 88 | + dhcpXManager.cfgService = new TestNetworkConfigRegistry(); |
89 | - dhcpManager.packetService = new TestPacketService(); | 89 | + dhcpXManager.packetService = new TestPacketService(); |
90 | - dhcpManager.coreService = new TestCoreService(); | 90 | + dhcpXManager.coreService = new TestCoreService(); |
91 | - dhcpManager.dhcpStore = new TestDHCPStore(); | 91 | + dhcpXManager.dhcpStore = new TestDhcpStore(); |
92 | hostProviderService = new TestHostProviderService(new TestHostProvider()); | 92 | hostProviderService = new TestHostProviderService(new TestHostProvider()); |
93 | - dhcpManager.hostProviderService = hostProviderService; | 93 | + dhcpXManager.hostProviderService = hostProviderService; |
94 | - dhcpManager.hostProviderRegistry = new TestHostRegistry(); | 94 | + dhcpXManager.hostProviderRegistry = new TestHostRegistry(); |
95 | - dhcpManager.activate(); | 95 | + dhcpXManager.activate(); |
96 | } | 96 | } |
97 | 97 | ||
98 | @After | 98 | @After |
99 | public void tearDown() { | 99 | public void tearDown() { |
100 | - dhcpManager.deactivate(); | 100 | + dhcpXManager.deactivate(); |
101 | } | 101 | } |
102 | 102 | ||
103 | /** | 103 | /** |
... | @@ -217,7 +217,7 @@ public class DHCPManagerTest { | ... | @@ -217,7 +217,7 @@ public class DHCPManagerTest { |
217 | /** | 217 | /** |
218 | * Mocks the DHCPStore. | 218 | * Mocks the DHCPStore. |
219 | */ | 219 | */ |
220 | - private final class TestDHCPStore implements DHCPStore { | 220 | + private final class TestDhcpStore implements DhcpStore { |
221 | 221 | ||
222 | 222 | ||
223 | public void populateIPPoolfromRange(Ip4Address startIP, Ip4Address endIP) { | 223 | public void populateIPPoolfromRange(Ip4Address startIP, Ip4Address endIP) { |
... | @@ -240,11 +240,11 @@ public class DHCPManagerTest { | ... | @@ -240,11 +240,11 @@ public class DHCPManagerTest { |
240 | public void releaseIP(MacAddress macID) { | 240 | public void releaseIP(MacAddress macID) { |
241 | } | 241 | } |
242 | 242 | ||
243 | - public Map<MacAddress, IPAssignment> listMapping() { | 243 | + public Map<MacAddress, IpAssignment> listMapping() { |
244 | - Map<MacAddress, IPAssignment> map = new HashMap<>(); | 244 | + Map<MacAddress, IpAssignment> map = new HashMap<>(); |
245 | - IPAssignment assignment = IPAssignment.builder() | 245 | + IpAssignment assignment = IpAssignment.builder() |
246 | .ipAddress(Ip4Address.valueOf(EXPECTED_IP)) | 246 | .ipAddress(Ip4Address.valueOf(EXPECTED_IP)) |
247 | - .assignmentStatus(IPAssignment.AssignmentStatus.Option_Assigned) | 247 | + .assignmentStatus(IpAssignment.AssignmentStatus.Option_Assigned) |
248 | .leasePeriod(300) | 248 | .leasePeriod(300) |
249 | .timestamp(new Date()) | 249 | .timestamp(new Date()) |
250 | .build(); | 250 | .build(); | ... | ... |
-
Please register or login to post a comment