diff -r 449f3459d285 -r c068f8c677e8 components/ruby/puppet/files/solaris/lib/puppet/provider/solaris_vlan/solaris.rb
--- a/components/ruby/puppet/files/solaris/lib/puppet/provider/solaris_vlan/solaris.rb	Wed Feb 10 16:31:24 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
-#
-
-Puppet::Type.type(:solaris_vlan).provide(:solaris_vlan) do
-    desc "Provider for creating Solaris VLANs"
-    confine :operatingsystem => [:solaris]
-    defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12']
-    commands :dladm => '/usr/sbin/dladm'
-
-    def self.instances
-        dladm("show-vlan", "-p", "-o", "link,over,vid").split(
-              "\n").collect do |line|
-            link, over, vlanid = line.split(":")
-            new(:name => link,
-                :ensure => :present,
-                :lower_link => over,
-                :vlanid => vlanid)
-        end
-    end
-
-    def self.prefetch(resources)
-        # pull the instances on the system
-        vlans = instances
-
-        # set the provider for the resource to set the property_hash
-        resources.keys.each do |name|
-            if provider = vlans.find{ |vlan| vlan.name == name}
-                resources[name].provider = provider
-            end
-        end
-    end
-
-    def lower_link
-        @property_hash[:lower_link]
-    end
-
-    def lower_link=(value)
-        dladm("modify-vlan", "-l", value, @resource[:name])
-    end
-
-    def vlanid
-        @property_hash[:vlanid]
-    end
-
-    def vlanid=(value)
-        dladm("modify-vlan", "-v", value, @resource[:name])
-    end
-
-    def add_options
-        options = []
-        if @resource[:temporary] == :true
-            options << "-t"
-        end
-        if @resource[:ensure] == :present and @resource[:force] == :true
-            options << "-f"
-        end
-        options
-    end
-
-    def exists?
-        @property_hash[:ensure] == :present
-    end
-
-    def create
-        dladm("create-vlan", add_options, "-l", @resource[:lower_link],
-              "-v", @resource[:vlanid], @resource[:name])
-    end
-
-    def destroy
-        dladm("delete-vlan", add_options, @resource[:name])
-    end
-end