dellcloudedge/barclamp-network — pull request #55 by galthaus (2012-08-31 02:34:47+00:00)
Title: Merge rails3anddb to development [2/6]

bin/crowbar_network | 66 ++++--
.../app/controllers/network_controller.rb | 92 ++++++--
crowbar_framework/app/models/conduit.rb | 22 ++
crowbar_framework/app/models/ip_address.rb | 3 +
crowbar_framework/app/models/ip_range.rb | 26 +++
crowbar_framework/app/models/network.rb | 12 +-
crowbar_framework/app/models/network_service.rb | 237 ++++++++++++++++++++
crowbar_framework/app/models/router.rb | 23 ++
.../db/migrate/20120730175122_create_networks.rb | 1 +
.../migrate/20120730175255_create_ip_addresses.rb | 3 +
.../db/migrate/20120821194639_create_conduits.rb | 23 ++
.../db/migrate/20120822201408_create_routers.rb | 10 +
.../db/migrate/20120827150258_create_ip_ranges.rb | 24 ++
13 files changed, 494 insertions(+), 48 deletions(-)