Fix link_type flag for objects read from state file + fix link_type

initializations in a few other places

Ticket: CM-4610
Reviewed By:
Testing Done: Tested with the failing sequence of events described in
the bug

addons/bridge.py

@@ -871,7 +871,7 @@ class bridge(moduleBase):
                         proc_file = ('/proc/sys/net/ipv6/conf/%s' %p +
                                      '/disable_ipv6')
                         self.write_file(proc_file, '0')
-                        if ifaceobj.link_type == ifaceLinkType.LINK_MASTER:
+                        if ifaceobj.link_type != ifaceLinkType.LINK_NA:
                            rtnetlink_api.rtnl_api.link_set(p, "down")
         except Exception, e:
             self.log_error(str(e))

ifupdown/iface.py

@@ -430,7 +430,7 @@ class iface():
         self.priv_flags = 0
         self.raw_config = []
         self.flags |= self._PICKLED
-        self.link_type = ifaceLinkType.LINK_UNKNOWN
+        self.link_type = ifaceLinkType.LINK_NA
         self.link_kind = ifaceLinkKind.UNKNOWN
 
     def dump_raw(self, logger):

ifupdown/ifupdownmain.py

@@ -299,6 +299,8 @@ class ifupdownMain(ifupdownBase):
         ifaceobj.name = ifacename
         ifaceobj.priv_flags = priv_flags
         ifaceobj.auto = True
+        if not self._link_master_slave:
+            ifaceobj.link_type = ifaceLinkType.LINK_NA
         if increfcnt:
             ifaceobj.inc_refcnt()
         self.ifaceobjdict[ifacename] = [ifaceobj]