crowbar/barclamp-network — pull request #186 by cloudedge (2013-06-28 05:13:09+00:00)
Title: Refactoring WIP with model as per discussions and engine migrations [2/6]

This is a preliminary step for refactoring where a lot of old models have been removed
and new ones added.

I'm pulling out old code and migrating to models

crowbar.yml files are starting to change
new jigs/roles templates are in place
database migrations PASS
the web app is NOT running yet
tests are not passing

chef/roles/network-admin/node-template.json | 82 +++
chef/roles/network-admin/role-template.json | 82 +++
chef/roles/network-bmc/node-template.json | 82 +++
chef/roles/network-bmc/role-template.json | 82 +++
crowbar.yml | 17 +-
.../app/models/barclamp_network/barclamp.rb | 47 +-
.../app/models/barclamp_network/network.rb | 1 -
.../20120801015043_barclamp_import_network.rb | 2 +-
.../db/migrate/20130312110000_create_deployment.rb | 33 -
.../app/assets/stylesheets/_network.sass | 52 --
.../app/controllers/conduits_controller.rb | 286 --------
.../app/controllers/networks_controller.rb | 380 ----------
.../scaffolds/allocated_ip_addresses_controller.rb | 19 -
.../scaffolds/bmc_interfaces_controller.rb | 19 -
.../app/controllers/scaffolds/bonds_controller.rb | 19 -
.../controllers/scaffolds/bus_maps_controller.rb | 19 -
.../app/controllers/scaffolds/buses_controller.rb | 19 -
.../scaffolds/conduit_actions_controller.rb | 19 -
.../scaffolds/conduit_filters_controller.rb | 19 -
.../scaffolds/conduit_rules_controller.rb | 19 -
.../controllers/scaffolds/conduits_controller.rb | 19 -
.../scaffolds/create_bonds_controller.rb | 19 -
.../scaffolds/create_vlans_controller.rb | 19 -
.../scaffolds/interface_maps_controller.rb | 19 -
.../scaffolds/interface_selectors_controller.rb | 19 -
.../controllers/scaffolds/interfaces_controller.rb | 19 -
.../scaffolds/ip_addresses_controller.rb | 19 -
.../controllers/scaffolds/ip_ranges_controller.rb | 19 -
.../scaffolds/network_mode_filters_controller.rb | 19 -
.../controllers/scaffolds/networks_controller.rb | 19 -
.../scaffolds/node_attribute_filters_controller.rb | 19 -
.../scaffolds/physical_interfaces_controller.rb | 19 -
.../controllers/scaffolds/routers_controller.rb | 19 -
.../scaffolds/select_by_indices_controller.rb | 19 -
.../scaffolds/select_by_speeds_controller.rb | 19 -
.../scaffolds/vlan_interfaces_controller.rb | 19 -
.../app/controllers/scaffolds/vlans_controller.rb | 19 -
.../app/models/allocated_ip_address.rb | 24 -
.../app/models/attrib_instance_bus_order.rb | 45 --
.../app/models/attrib_instance_ip_address.rb | 51 --
crowbar_framework/app/models/bmc_interface.rb | 16 -
crowbar_framework/app/models/bond.rb | 29 -
crowbar_framework/app/models/bus.rb | 22 -
crowbar_framework/app/models/bus_map.rb | 23 -
crowbar_framework/app/models/conduit.rb | 70 --
crowbar_framework/app/models/conduit_action.rb | 17 -
crowbar_framework/app/models/conduit_filter.rb | 24 -
crowbar_framework/app/models/conduit_rule.rb | 123 ----
crowbar_framework/app/models/create_bond.rb | 19 -
crowbar_framework/app/models/create_vlan.rb | 16 -
crowbar_framework/app/models/interface.rb | 26 -
crowbar_framework/app/models/interface_map.rb | 36 -
crowbar_framework/app/models/interface_selector.rb | 37 -
crowbar_framework/app/models/ip_address.rb | 43 --
crowbar_framework/app/models/ip_range.rb | 28 -
crowbar_framework/app/models/network.rb | 212 ------
.../app/models/network_mode_filter.rb | 32 -
crowbar_framework/app/models/network_service.rb | 761 --------------------
crowbar_framework/app/models/network_utils.rb | 59 --
.../app/models/node_attribute_filter.rb | 24 -
crowbar_framework/app/models/physical_interface.rb | 17 -
crowbar_framework/app/models/role_filter.rb | 33 -
crowbar_framework/app/models/router.rb | 24 -
crowbar_framework/app/models/select_by_index.rb | 27 -
crowbar_framework/app/models/select_by_speed.rb | 61 --
crowbar_framework/app/models/selector.rb | 28 -
crowbar_framework/app/models/vlan.rb | 22 -
crowbar_framework/app/models/vlan_interface.rb | 18 -
.../barclamp/network/_edit_deployment.html.haml | 10 -
.../app/views/conduits/_conduit_rules.html.haml | 3 -
.../app/views/conduits/_show.html.haml | 11 -
.../app/views/conduits/index.html.haml | 34 -
.../app/views/conduits/show.html.haml | 1 -
.../app/views/networks/_dense.html.haml | 10 -
.../app/views/networks/_form.html.haml | 47 --
.../app/views/networks/_ip_ranges.html.haml | 3 -
.../app/views/networks/_show.html.haml | 23 -
.../app/views/networks/_switch.html.haml | 17 -
.../app/views/networks/edit.html.haml | 4 -
.../app/views/networks/index.html.haml | 36 -
.../app/views/networks/nodes.html.haml | 38 -
.../app/views/networks/show.html.haml | 1 -
.../app/views/networks/switch.html.haml | 83 ---
.../app/views/networks/update.html.haml | 5 -
.../app/views/networks/vlan.html.haml | 26 -
crowbar_framework/config/locales/network/en.yml | 180 -----
.../db/migrate/20120730175122_create_networks.rb | 27 -
.../db/migrate/20120730175238_create_interfaces.rb | 29 -
.../migrate/20120730175255_create_ip_addresses.rb | 27 -
.../20120801015043_barclamp_import_network.rb | 24 -
.../db/migrate/20120821194639_create_conduits.rb | 24 -
.../db/migrate/20120822201408_create_routers.rb | 24 -
.../db/migrate/20120827150258_create_ip_ranges.rb | 24 -
.../db/migrate/20120914175602_create_buses.rb | 25 -
.../db/migrate/20120914175721_create_bus_maps.rb | 24 -
.../20120914175733_create_interface_maps.rb | 23 -
.../20120918205152_create_interface_selectors.rb | 23 -
.../20120918205303_create_conduit_filters.rb | 29 -
.../20120919110841_create_conduit_actions.rb | 26 -
.../migrate/20120919190544_create_conduit_rules.rb | 23 -
.../db/migrate/20121214183538_create_vlans.rb | 24 -
.../db/migrate/20130112145100_create_selectors.rb | 25 -
.../db/migrate/20130115160000_network_navs.rb | 32 -
...20130115220245_create_allocated_ip_addresses.rb | 27 -
.../20130123083500_create_interfaces_networks.rb | 23 -
.../db/migrate/20130124211800_scaffold_navs.rb | 74 --
.../barclamps/crowbar/Network--barclamp.creole | 177 -----
crowbar_framework/test/network_test_helper.rb | 177 -----
.../test/unit/allocated_ip_address_model.rb | 142 ----
.../test/unit/attrib_instance_bus_order_test.rb | 35 -
.../test/unit/attrib_instance_ip_address_test.rb | 55 --
crowbar_framework/test/unit/bond_model_test.rb | 83 ---
crowbar_framework/test/unit/bus_map_model_test.rb | 56 --
crowbar_framework/test/unit/bus_model_test.rb | 47 --
crowbar_framework/test/unit/conduit_action_test.rb | 23 -
crowbar_framework/test/unit/conduit_filter_test.rb | 25 -
crowbar_framework/test/unit/conduit_rule_test.rb | 290 --------
crowbar_framework/test/unit/conduit_test.rb | 426 -----------
crowbar_framework/test/unit/create_bond_test.rb | 47 --
.../test/unit/interface_map_model_test.rb | 78 --
.../test/unit/interface_model_test.rb | 53 --
.../test/unit/interface_selector_test.rb | 103 ---
.../test/unit/ip_address_model_test.rb | 93 ---
crowbar_framework/test/unit/ip_range_model_test.rb | 83 ---
.../test/unit/network_mode_filter_test.rb | 42 --
crowbar_framework/test/unit/network_model_test.rb | 354 ---------
.../test/unit/network_service_test.rb | 500 -------------
crowbar_framework/test/unit/network_utils_test.rb | 95 ---
.../test/unit/node_attribute_filter_test.rb | 44 --
crowbar_framework/test/unit/role_filter_test.rb | 44 --
crowbar_framework/test/unit/router_model_test.rb | 68 --
.../test/unit/select_by_index_test.rb | 62 --
.../test/unit/select_by_speed_test.rb | 145 ----
crowbar_framework/test/unit/selector_test.rb | 27 -
crowbar_framework/test/unit/vlan_model_test.rb | 47 --
135 files changed, 339 insertions(+), 7759 deletions(-)

Crowbar-Pull-ID: cf7927f48d67ce51709abf54344df90b1e91f2cc

Crowbar-Release: development