ONOS-7509 preserve all attributes when ensuring enabled state
- it seemed deleted flag was lost due to old code.
Change-Id: I0abb22835318f2e165bbf23fa2978b601d563be1
diff --git a/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java b/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java
index ee5ac99..a6b918c 100644
--- a/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java
+++ b/apps/optical-model/src/main/java/org/onosproject/net/optical/config/OpticalPortOperator.java
@@ -133,11 +133,10 @@
// result is no-op
return descr;
}
- return new DefaultPortDescription(port,
- descr.isEnabled(),
- descr.type(),
- descr.portSpeed(),
- sa);
+ return DefaultPortDescription.builder(descr)
+ .withPortNumer(port)
+ .annotations(sa)
+ .build();
}
/**
diff --git a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
index 068c676..37fc2cd 100644
--- a/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onosproject/net/device/impl/DeviceManager.java
@@ -568,11 +568,9 @@
private PortDescription ensurePortEnabledState(PortDescription desc, boolean enabled) {
if (desc.isEnabled() != enabled) {
- return new DefaultPortDescription(desc.portNumber(),
- enabled,
- desc.type(),
- desc.portSpeed(),
- desc.annotations());
+ return DefaultPortDescription.builder(desc)
+ .isEnabled(enabled)
+ .build();
}
return desc;
}