Merge branch 'dev' into release/cl-stable

addons/bridge.py

@@ -886,10 +886,7 @@ class bridge(moduleBase):
                 (vids_to_del, vids_to_add) = \
                     self._diff_vids(vids_to_add, running_vids)
 
-            if running_pvid:
-                if running_pvid != pvid_int and running_pvid != 0:
-                    pvid_to_del = running_pvid
-            else:
+            if not running_pvid:
                 # There cannot be a no running pvid.
                 # It might just not be in our cache:
                 # this can happen if at the time we were
@@ -897,6 +894,10 @@ class bridge(moduleBase):
                 # was not part of the bridge
                 running_pvid = 1
 
+            if running_pvid:
+                if running_pvid != pvid_int and running_pvid != 0:
+                    pvid_to_del = running_pvid
+
             if (pvid_to_del and (pvid_to_del in vids_int) and
                 (pvid_to_del not in vids_to_add)):
                 # kernel deletes dont take into account

addons/vrf.py

@@ -373,8 +373,13 @@ class vrf(moduleBase):
             elif ifaceobj:
                 vrf_master_objs = ifaceobj_getfunc(vrfname)
                 if not vrf_master_objs:
-                    self.logger.warn('%s: vrf master ifaceobj not found'
-                                     %ifacename)
+                    # this is the case where vrf is assigned to an interface
+                    # but user has not provided a vrf interface.
+                    # people expect you to warn them but go ahead with the
+                    # rest of the config on that interface
+                    netlink.link_set_updown(ifacename, "up")
+                    self.log_error('vrf master ifaceobj %s not found'
+                                   %vrfname)
                     return
                 if (ifupdownflags.flags.ALL or
                     (ifupdownflags.flags.CLASS and

addons/vxlan.py

@@ -214,6 +214,9 @@ class vxlan(moduleBase):
         attrval = vxlanattrs.get('vxlanid')
         if attrval:
             ifaceobjrunning.update_config('vxlan-id', vxlanattrs.get('vxlanid'))
+        else:
+            # if there is no vxlan id, this is not a vxlan port
+            return
         attrval = vxlanattrs.get('local')
         if attrval:
             ifaceobjrunning.update_config('vxlan-local-tunnelip', attrval)