Adding method to retrieve profile based on ModelType

Adding models for EthernetPort profile

equipment-models/src/main/java/com/telecominfraproject/wlan/equipment/models/ElementRadioConfiguration.java

@@ -62,7 +62,7 @@ public class ElementRadioConfiguration extends BaseJsonModel
 
         if (radioType == RadioType.is5GHz) {
             returnValue.setChannelNumber(36);
-            returnValue.setBackupChannelNumber(149);
+            returnValue.setBackupChannelNumber(44);
         } else if (radioType == RadioType.is5GHzL) {
             returnValue.setChannelNumber(36);
             returnValue.setBackupChannelNumber(44);

equipment-service-remote/src/test/java/com/telecominfraproject/wlan/equipment/EquipmentServiceRemoteTest.java

@@ -932,9 +932,9 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(11, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(36, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(44, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(36, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
-        assertEquals(149, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
+        assertEquals(44, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
             
         Map<RadioType, Integer> primaryChannels =  new EnumMap<>(RadioType.class);
         Map<RadioType, Integer> backupChannels =  new EnumMap<>(RadioType.class);
@@ -970,7 +970,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(6, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(36, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(44, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(40, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
         assertEquals(48, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
         
@@ -980,7 +980,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         
         backupChannels.clear();
         backupChannels.put(RadioType.is2dot4GHz, 6);
-        backupChannels.put(RadioType.is5GHz, 44);
+        backupChannels.put(RadioType.is5GHz, 149);
         
         autoChannelSelections.clear();
         autoChannelSelections.put(RadioType.is2dot4GHz, true);
@@ -1007,7 +1007,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(6, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(161, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(44, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(40, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
         assertEquals(48, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
 

profile-models/src/main/java/com/telecominfraproject/wlan/profile/ethernetport/models/WiredEthernetPortConfiguration.java

@@ -0,0 +1,94 @@
+package com.telecominfraproject.wlan.profile.ethernetport.models;
+
+import com.telecominfraproject.wlan.core.model.equipment.PushableConfiguration;
+import com.telecominfraproject.wlan.profile.models.ProfileDetails;
+import com.telecominfraproject.wlan.profile.models.ProfileType;
+import com.telecominfraproject.wlan.profile.ssid.models.SsidConfiguration;
+
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * @author rsharma
+ */
+public class WiredEthernetPortConfiguration extends ProfileDetails implements PushableConfiguration<WiredEthernetPortConfiguration> {
+
+    private static final long serialVersionUID = 5326345492525165619L;
+
+    private String equipmentModel; // e.g., MR8300-CA, EC420-G1
+
+    private Set<WiredPort> ethPorts;
+
+    public WiredEthernetPortConfiguration() {
+        // for Serialization
+    }
+
+    public WiredEthernetPortConfiguration(String equipmentModel, Set<WiredPort> ethPorts) {
+        this.equipmentModel = equipmentModel;
+        this.ethPorts = ethPorts;
+    }
+
+    public static WiredEthernetPortConfiguration createWithDefaults() {
+    	return new WiredEthernetPortConfiguration();
+    }
+    
+    public String getEquipmentModel() {
+        return equipmentModel;
+    }
+
+    public void setEquipmentModel(String equipmentModel) {
+        this.equipmentModel = equipmentModel;
+    }
+
+    public Set<WiredPort> getEthPorts() {
+        return ethPorts;
+    }
+
+    public void setEthPorts(Set<WiredPort> ethPorts) {
+        this.ethPorts = ethPorts;
+    }
+
+    @Override
+    public boolean needsToBeUpdatedOnDevice(WiredEthernetPortConfiguration previousVersion) {
+        if (previousVersion != null) {
+            return !Objects.equals(this, previousVersion);
+        }
+
+        return true;
+    }
+
+    @Override
+    public ProfileType getProfileType() {
+        return ProfileType.wired_ethernet_port;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof WiredEthernetPortConfiguration)) {
+            return false;
+        }
+        WiredEthernetPortConfiguration that = (WiredEthernetPortConfiguration) o;
+        return Objects.equals(getEquipmentModel(), that.getEquipmentModel()) &&
+                Objects.equals(getEthPorts(), that.getEthPorts());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getEquipmentModel(), getEthPorts());
+    }
+
+    @Override
+    public WiredEthernetPortConfiguration clone() {
+        WiredEthernetPortConfiguration ret = (WiredEthernetPortConfiguration)super.clone();
+
+        if (ethPorts != null) {
+            ret.ethPorts = new HashSet<>(ethPorts);
+        }
+
+        return ret;
+    }
+}

profile-models/src/main/java/com/telecominfraproject/wlan/profile/ethernetport/models/WiredPort.java

@@ -0,0 +1,112 @@
+package com.telecominfraproject.wlan.profile.ethernetport.models;
+
+import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author rsharma
+ */
+public class WiredPort extends BaseJsonModel {
+
+    private static final long serialVersionUID = 6595665507927422135L;
+
+    private String name; //eth0 or eth1
+    private String displayName; // LAN-1, WAN-0 etc
+    private String ifName; // lan, wan etc
+    private String ifType; // bridge/Nat
+    private int vlanId; // native vlanId/tagged vlanId
+    private boolean trunkEnabled; // trunk enabled or disabled
+    private List<Integer> allowedVlanIds; // allowed vlanIds
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getIfName() {
+        return ifName;
+    }
+
+    public void setIfName(String ifName) {
+        this.ifName = ifName;
+    }
+
+    public String getIfType() {
+        return ifType;
+    }
+
+    public void setIfType(String ifType) {
+        this.ifType = ifType;
+    }
+
+    public int getVlanId() {
+        return vlanId;
+    }
+
+    public void setVlanId(int vlanId) {
+        this.vlanId = vlanId;
+    }
+
+    public boolean isTrunkEnabled() {
+        return trunkEnabled;
+    }
+
+    public void setTrunkEnabled(boolean trunkEnabled) {
+        this.trunkEnabled = trunkEnabled;
+    }
+
+    public List<Integer> getAllowedVlanIds() {
+        return allowedVlanIds;
+    }
+
+    public void setAllowedVlanIds(List<Integer> allowedVlanIds) {
+        this.allowedVlanIds = allowedVlanIds;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof WiredPort)) {
+            return false;
+        }
+        WiredPort wiredPort = (WiredPort) o;
+        return getVlanId() == wiredPort.getVlanId() && isTrunkEnabled() == wiredPort.isTrunkEnabled()
+                && Objects.equals(getName(), wiredPort.getName())
+                && Objects.equals(getDisplayName(), wiredPort.getDisplayName())
+                && Objects.equals(getIfName(), wiredPort.getIfName())
+                && Objects.equals(getIfType(), wiredPort.getIfType())
+                && Objects.equals(getAllowedVlanIds(), wiredPort.getAllowedVlanIds());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName(), getDisplayName(), getIfName(), getIfType(), getVlanId(), isTrunkEnabled(), getAllowedVlanIds());
+    }
+
+    @Override
+    public WiredPort clone() {
+        WiredPort port = (WiredPort) super.clone();
+
+        if (getAllowedVlanIds() != null) {
+            port.allowedVlanIds = new ArrayList<>(getAllowedVlanIds());
+        }
+
+        return port;
+    }
+}

profile-models/src/main/java/com/telecominfraproject/wlan/profile/models/ProfileContainer.java

@@ -5,6 +5,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.telecominfraproject.wlan.profile.ethernetport.models.WiredEthernetPortConfiguration;
+
 /**
  * @author dtop
  * Utility class for dealing with profiles
@@ -40,6 +42,26 @@ public class ProfileContainer {
 		return ret.get(0);
 	}
 
+	public Profile getChildOfTypeOrNullByEquipmentModel(long profileId, ProfileType childProfileType,
+														String equipmentModel) {
+		// The profile type of the profileId should be equipment_ap
+		Profile apProfile = profileMap.get(profileId);
+		if (apProfile != null && apProfile.getProfileType() == ProfileType.equipment_ap) {
+
+			List<Profile> profiles = getChildrenOfType(profileId, childProfileType);
+			for (Profile ret : profiles) {
+				WiredEthernetPortConfiguration config = (WiredEthernetPortConfiguration) ret.getDetails();
+				if (config != null && config.getEquipmentModel() != null
+						&& config.getEquipmentModel().equals(equipmentModel)) {
+					return ret;
+				}
+			}
+		} else {
+			throw new IllegalArgumentException("Profile Id " + profileId + " is not of type equipment_ap");
+		}
+		return null;
+	}
+
 	public List<Profile> getChildrenOfType(long profileId, ProfileType childProfileType) {
 		Profile parent = profileMap.get(profileId);
 		List<Profile> ret = new ArrayList<>();	

profile-models/src/main/java/com/telecominfraproject/wlan/profile/models/ProfileType.java

@@ -62,6 +62,8 @@ public class ProfileType implements EnumWithId {
     passpoint_venue = new ProfileType(12,"passpoint_venue"),
     passpoint_osu_id_provider = new ProfileType(13,"passpoint_osu_id_provider"),
     ap_event_rate = new ProfileType(14,"ap_event_rate"),
+    metrics = new ProfileType(15,"metrics"),
+    wired_ethernet_port = new ProfileType(16, "wired_ethernet_port"),
     UNSUPPORTED = new ProfileType(-1, "UNSUPPORTED");
     
     static {

profile-models/src/main/java/com/telecominfraproject/wlan/profile/rf/models/RfElementConfiguration.java

@@ -116,7 +116,7 @@ public class RfElementConfiguration extends BaseJsonModel {
         ret.setMinAutoCellSize(MIN_CELL_SIZE_MAP.get(radioType));
         ret.setMaxAutoCellSize(MAX_CELL_SIZE_MAP.get(radioType));
         if (radioType == RadioType.is5GHz || radioType == RadioType.is5GHzL || radioType == RadioType.is5GHzU) {
-            ret.setChannelBandwidth(ChannelBandwidth.is80MHz);
+            ret.setChannelBandwidth(ChannelBandwidth.is40MHz);
             ret.setRadioMode(RadioMode.modeAC);
         } else {
             ret.setChannelBandwidth(ChannelBandwidth.is20MHz);

provisioning-sp/src/main/java/com/telecominfraproject/wlan/streams/provisioning/EquipmentConfigPushTrigger.java

@@ -269,6 +269,11 @@ public class EquipmentConfigPushTrigger extends StreamProcessor {
             status.setCustomerId(equipment.getCustomerId());
             statusServiceInterface.update(status);
         }
+        status = statusServiceInterface.getOrNull(existingEquipment.getCustomerId(), existingEquipment.getId(), StatusDataType.FIRMWARE);
+        if (status != null) {
+            status.setCustomerId(equipment.getCustomerId());
+            statusServiceInterface.update(status);
+        }
 
         // Alarms has to move to new customerId as well
         List<Alarm> oldCustomerAlarms = alarmServiceInterface.get(existingEquipment.getCustomerId(), Set.of(existingEquipment.getId()), null);

status-models/src/main/java/com/telecominfraproject/wlan/status/equipment/models/EquipmentAdminStatusData.java

@@ -5,6 +5,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
 
+import com.telecominfraproject.wlan.core.model.equipment.LedStatus;
 import com.telecominfraproject.wlan.status.models.StatusCode;
 import com.telecominfraproject.wlan.status.models.StatusDataType;
 import com.telecominfraproject.wlan.status.models.StatusDetails;

status-models/src/main/java/com/telecominfraproject/wlan/status/equipment/models/LedStatus.java

@@ -1,6 +0,0 @@
-
-package com.telecominfraproject.wlan.status.equipment.models;
-
-public enum LedStatus {
-    led_blink, led_off, UNKNOWN,
-}

status-models/src/main/java/com/telecominfraproject/wlan/status/equipment/report/models/WiredEthernetPortStatusData.java

@@ -0,0 +1,67 @@
+package com.telecominfraproject.wlan.status.equipment.report.models;
+
+import com.telecominfraproject.wlan.status.models.StatusDataType;
+import com.telecominfraproject.wlan.status.models.StatusDetails;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * @author rsharma
+ */
+public class WiredEthernetPortStatusData extends StatusDetails {
+    private static final long serialVersionUID = 1684955685155400122L;
+
+    // key is ifName, value is the list of wiredPortStatus that link to the ifName
+    private Map<String, List<WiredPortStatus>> interfacePortStatusMap;
+    
+    public WiredEthernetPortStatusData() {
+    	this.interfacePortStatusMap = new HashMap<>();
+    }
+
+    public WiredEthernetPortStatusData(Map<String, List<WiredPortStatus>> interfacePortStatusMap) {
+        this.interfacePortStatusMap = interfacePortStatusMap;
+    }
+
+    public Map<String, List<WiredPortStatus>> getInterfacePortStatusMap() {
+        return interfacePortStatusMap;
+    }
+
+    public void setInterfacePortStatusMap(Map<String, List<WiredPortStatus>> interfacePortStatusMap) {
+        this.interfacePortStatusMap = interfacePortStatusMap;
+    }
+
+    @Override
+    public StatusDataType getStatusDataType() {
+        return StatusDataType.WIRED_ETHERNET_PORT;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof WiredEthernetPortStatusData)) {
+            return false;
+        }
+        WiredEthernetPortStatusData that = (WiredEthernetPortStatusData) o;
+        return Objects.equals(getInterfacePortStatusMap(), that.getInterfacePortStatusMap());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getInterfacePortStatusMap());
+    }
+
+    @Override
+    public WiredEthernetPortStatusData clone() {
+        WiredEthernetPortStatusData data = (WiredEthernetPortStatusData) super.clone();
+
+        if (interfacePortStatusMap != null) {
+            data.interfacePortStatusMap = new HashMap<>(interfacePortStatusMap);
+        }
+        return data;
+    }
+}

status-models/src/main/java/com/telecominfraproject/wlan/status/equipment/report/models/WiredPortStatus.java

@@ -0,0 +1,149 @@
+package com.telecominfraproject.wlan.status.equipment.report.models;
+
+import com.telecominfraproject.wlan.core.model.json.BaseJsonModel;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * @author rsharma
+ */
+public class WiredPortStatus extends BaseJsonModel {
+
+    private static final long serialVersionUID = 5525006111579379607L;
+
+    private String name; // eth_port: eth0 or eth1
+    private String originalIfName; // ifName when the AP came up (lan, wan etc.)
+    private String currentIfName; // Current ifName (e.g. lan, wan etc.)
+    private String ifType; // bridge/Nat/eth/vlan
+    private int speed; // in MBPS
+    private String duplex; // full, half
+    private String operationalState; // Operational State
+    private int vlanId; // tagged VlanId
+    private boolean trunkEnabled; // trunk enabled or disabled
+    private List<Integer> allowedVlanIds; // allowed vlanIds
+
+    public WiredPortStatus() {
+    	
+    }
+
+    public WiredPortStatus(String name, String originalIfName, String currentIfName, String ifType, int speed, String duplex,
+                           String operationalState, int vlanId, boolean trunkEnabled, List<Integer> allowedVlanIds) {
+        this.name = name;
+        this.originalIfName = originalIfName;
+        this.currentIfName = currentIfName;
+        this.ifType = ifType;
+        this.speed = speed;
+        this.duplex = duplex;
+        this.operationalState = operationalState;
+        this.vlanId = vlanId;
+        this.trunkEnabled = trunkEnabled;
+        this.allowedVlanIds = allowedVlanIds;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (!(o instanceof WiredPortStatus)) {
+            return false;
+        }
+        WiredPortStatus that = (WiredPortStatus) o;
+        return getSpeed() == that.getSpeed() && Objects.equals(getName(), that.getName())
+                && Objects.equals(getOriginalIfName(), that.getOriginalIfName())
+                && Objects.equals(getCurrentIfName(), that.getCurrentIfName())
+                && Objects.equals(getIfType(), that.getIfType())
+                && Objects.equals(getDuplex(), that.getDuplex())
+                && Objects.equals(getOperationalState(), that.getOperationalState())
+                && getVlanId() == that.getVlanId()
+                && Objects.equals(getAllowedVlanIds(), that.getAllowedVlanIds())
+                && Objects.equals(isTrunkEnabled(), that.isTrunkEnabled());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getName(), getOriginalIfName(), getCurrentIfName(), getIfType(), getSpeed(), getDuplex(),
+                getOperationalState(), getVlanId(), getAllowedVlanIds(), isTrunkEnabled());
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOriginalIfName() {
+        return originalIfName;
+    }
+
+    public void setOriginalIfName(String originalIfName) {
+        this.originalIfName = originalIfName;
+    }
+
+    public String getCurrentIfName() {
+        return currentIfName;
+    }
+
+    public void setCurrentIfName(String currentIfName) {
+        this.currentIfName = currentIfName;
+    }
+
+    public String getIfType() {
+        return ifType;
+    }
+
+    public void setIfType(String ifType) {
+        this.ifType = ifType;
+    }
+
+    public int getSpeed() {
+        return speed;
+    }
+
+    public void setSpeed(int speed) {
+        this.speed = speed;
+    }
+
+    public String getDuplex() {
+        return duplex;
+    }
+
+    public void setDuplex(String duplex) {
+        this.duplex = duplex;
+    }
+
+    public String getOperationalState() {
+        return operationalState;
+    }
+
+    public void setOperationalState(String operationalState) {
+        this.operationalState = operationalState;
+    }
+
+    public int getVlanId() {
+        return vlanId;
+    }
+
+    public void setVlanId(int vlanId) {
+        this.vlanId = vlanId;
+    }
+
+    public List<Integer> getAllowedVlanIds() {
+        return allowedVlanIds;
+    }
+
+    public void setAllowedVlanIds(List<Integer> allowedVlanIds) {
+        this.allowedVlanIds = allowedVlanIds;
+    }
+
+    public boolean isTrunkEnabled() {
+        return trunkEnabled;
+    }
+
+    public void setTrunkEnabled(boolean trunkEnabled) {
+        this.trunkEnabled = trunkEnabled;
+    }
+}

status-models/src/main/java/com/telecominfraproject/wlan/status/models/StatusDataType.java

@@ -101,6 +101,9 @@ public class StatusDataType implements EnumWithId {
      */    
     EQUIPMENT_MANUFACTURER_DATA = new StatusDataType(17, "EQUIPMENT_MANUFACTURER_DATA", Set.of(StatusTrait.DeleteOnEquipmentDisconnect)),
 
+    // STATUS OF ETHERNET PORTS ON THE DEVICE
+    WIRED_ETHERNET_PORT = new StatusDataType(18, "WIRED_ETHERNET_PORT", Set.of(StatusTrait.DeleteOnEquipmentDisconnect)),
+
     UNSUPPORTED  = new StatusDataType(-1, "UNSUPPORTED") ;
     
     static {