From 2b1935d8249666e96848e285fa11368d4654ad46 Mon Sep 17 00:00:00 2001
From: Yuta HIGUCHI <y-higuchi@ak.jp.nec.com>
Date: Thu, 1 Mar 2018 21:41:06 -0800
Subject: [PATCH] ONOS-7509 preserve all attributes when ensuring enabled state

- it seemed deleted flag was lost due to old code.

Change-Id: I0abb22835318f2e165bbf23fa2978b601d563be1
---
 .../net/optical/config/OpticalPortOperator.java          | 9 ++++-----
 .../org/onosproject/net/device/impl/DeviceManager.java   | 8 +++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

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 ee5ac99b19..a6b918cad6 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 @@ public final class OpticalPortOperator implements PortConfigOperator {
             // 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 068c676756..37fc2cd415 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 @@ public class DeviceManager
 
         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;
         }