diff --git a/python/adapters/brcm_openomci_onu/uni_port.py b/python/adapters/brcm_openomci_onu/uni_port.py
index 0548458..99d42cd 100644
--- a/python/adapters/brcm_openomci_onu/uni_port.py
+++ b/python/adapters/brcm_openomci_onu/uni_port.py
@@ -51,12 +51,14 @@
         self._type = type
         self._uni_id = uni_id
 
-        self._admin_state = AdminState.ENABLED
-        self._oper_status = OperStatus.ACTIVE
+        self._admin_state = AdminState.DISABLED
+        self._oper_status = OperStatus.DISCOVERED
 
     def __str__(self):
-        return "UniPort - name: {}, port_number: {}, entity_id: {}, mac_bridge_port_num: {}, type: {}, ofp_port: {}"\
-            .format(self.name, self.port_number, self.entity_id, self._mac_bridge_port_num, self.type, self._ofp_port_no)
+        return "UniPort - name: {}, port_number: {}, admin_state: {}, oper_state: {}, entity_id: {}, " \
+               "mac_bridge_port_num: {}, type: {}, ofp_port: {}"\
+            .format(self.name, self.port_number, self.adminstate, self.operstatus, self.entity_id,
+                    self._mac_bridge_port_num, self.type, self._ofp_port_no)
 
     def __repr__(self):
         return str(self)
@@ -69,7 +71,7 @@
     def _start(self):
         self._cancel_deferred()
         self._admin_state = AdminState.ENABLED
-        self._oper_status = OperStatus.ACTIVE
+        self._oper_status = OperStatus.ACTIVATING
 
     def _stop(self):
         self._cancel_deferred()
@@ -84,6 +86,22 @@
         pass
 
     @property
+    def adminstate(self):
+        return self._admin_state
+
+    @adminstate.setter
+    def adminstate(self, value):
+        self._admin_state = value
+
+    @property
+    def operstatus(self):
+        return self._oper_status
+
+    @operstatus.setter
+    def operstatus(self, value):
+        self._oper_status = value
+
+    @property
     def name(self):
         return self._name
 
