search for: networkcontroller

...iff --git a/src/ovirt-agent/lib/ovirt/controllers/network_controller.rb b/src/ovirt-agent/lib/ovirt/controllers/network_controller.rb new file mode 100644 index 0000000..1a8ffd1 --- /dev/null +++ b/src/ovirt-agent/lib/ovirt/controllers/network_controller.rb @@ -0,0 +1,30 @@ +module Ovirt + + class NetworkController < AgentController + + include NetworkService + + def find(id) + svc_show(id) + render(@network) + end + + def list + puts "query for Network class!" + svc_list + @networks.collect { |network| render(network) } + end + + def render(network) +...

...iff --git a/src/ovirt-agent/lib/ovirt/controllers/network_controller.rb b/src/ovirt-agent/lib/ovirt/controllers/network_controller.rb new file mode 100644 index 0000000..dd6b4e5 --- /dev/null +++ b/src/ovirt-agent/lib/ovirt/controllers/network_controller.rb @@ -0,0 +1,26 @@ +module Ovirt + + class NetworkController < AgentController + + include NetworkService + + def find(id) + svc_show(id) + render(@network) + end + + def list + puts "query for Network class!" + svc_list + @networks.collect { |network| render(network) } + end + + def render(network) +...

...pp/views/network/edit_network_ip_addresses.rhtml diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb index c477c56..2f082a8 100644 --- a/src/app/controllers/network_controller.rb +++ b/src/app/controllers/network_controller.rb @@ -55,6 +55,12 @@ class NetworkController < ApplicationController end def create + # create the ip address if specified + address = params[:ip_address][:address] + unless address.nil? || address == "" + params[:network][:ip_addresses] = [ IpAddress.new(params[:ip_address]) ] + end + alert = svc_c...

...quot;: " + reason else reason diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb index eca8fab..c477c56 100644 --- a/src/app/controllers/network_controller.rb +++ b/src/app/controllers/network_controller.rb @@ -81,7 +81,7 @@ class NetworkController < ApplicationController successes << @network # PermissionError and ActionError are expected rescue Exception => ex - failures[@network.nil? network_id : @network] = ex.message + failures[@network.nil? ? network_id : @network] = ex.message end...

...set_perms(@host.hardware_pool) - end - - end diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb index 5af0a73..9066724 100644 --- a/src/app/controllers/network_controller.rb +++ b/src/app/controllers/network_controller.rb @@ -175,13 +175,4 @@ class NetworkController < ApplicationController alert = svc_destroy_bonding(params[:id]) render :json => {:object => "bonding", :success => true, :alert => alert} end - - protected - # FIXME: remove these when service transition is complete. these are here - # to keep from running...

...644 src/app/services/network_service.rb diff --git a/src/app/controllers/network_controller.rb b/src/app/controllers/network_controller.rb index 244d041..5af0a73 100644 --- a/src/app/controllers/network_controller.rb +++ b/src/app/controllers/network_controller.rb @@ -18,471 +18,170 @@ # class NetworkController < ApplicationController + include NetworkService ########################## Networks related actions - before_filter :pre_list, :only => [:list] - - def authorize_admin - # TODO more robust permission system - # either by subclassing network from pool - # or by extendi...