dellcloudedge/barclamp-network — pull request #78 by cdearborn (2012-09-28 18:22:28+00:00)
Title: Final network modeling changes [1/1]

Updated the network model to reflect the new network json.
This involved moving conduit/conduit filter reln to conduitrule/conduitfilter
and changing conduitrule/conduitaction relationship to one/many
Moved conduit name from conduitaction to conduit where it belongs.

crowbar_framework/app/models/conduit.rb | 3 +-
crowbar_framework/app/models/conduit_action.rb | 6 +---
crowbar_framework/app/models/conduit_filter.rb | 2 +-
crowbar_framework/app/models/conduit_rule.rb | 6 ++-
crowbar_framework/app/models/network.rb | 3 +-
crowbar_framework/app/models/network_service.rb | 15 ++++------
.../20120918205303_create_conduit_filters.rb | 2 +-
crowbar_framework/test/network_test_helper.rb | 17 +++++++----
crowbar_framework/test/unit/conduit_action_test.rb | 10 +------
crowbar_framework/test/unit/conduit_rule_test.rb | 31 ++++++++++++++++----
crowbar_framework/test/unit/conduit_test.rb | 20 +-----------
crowbar_framework/test/unit/create_bond_test.rb | 8 -----
crowbar_framework/test/unit/network_model_test.rb | 21 ++++++-------
.../test/unit/network_service_test.rb | 4 +-
14 files changed, 66 insertions(+), 82 deletions(-)