Squash Vlan and VlanInterface into 1 class [1/1]

This pull request squashes Vlan and VlanInterface down into the Vlan class
since the original Vlan class does not seem to be needed.


 .../scaffolds/vlan_interfaces_controller.rb        |   20 ----------------
 .../app/models/barclamp_network/network.rb         |    1 -
 .../app/models/barclamp_network/vlan.rb            |    5 +---
 .../app/models/barclamp_network/vlan_interface.rb  |   17 -------------
 .../db/migrate/20120730175238_create_interfaces.rb |    1 +
 .../db/migrate/20121214183538_create_vlans.rb      |   24 -------------------
 .../test/unit/network_model_test.rb                |   17 -------------
 .../barclamp_network/test/unit/vlan_model_test.rb  |   25 ++++++++------------
 8 files changed, 12 insertions(+), 98 deletions(-)

Crowbar-Pull-ID: b0cc8e1817534047db36abc1aab3c423723e910a

Crowbar-Release: development