dewiring 0.1.2 → 0.1.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzU2MDIzZWQ2ZjM5OTgxMmNhMjkwYTU3YjE2M2RiMTRhM2JjMmU3Zg==
+    NzZlOTQxOTc2YzIyMmExOWQ1OGJmZmRmYzQ4MDRlMWJiMTZkMmI0Yg==
   data.tar.gz: !binary |-
-    ZTZmZWM4NDZiMTU5ZWRkOTkzZjk0YTJjNjQ4MmFhNWQ5N2VkMjUwNA==
+    OGRjNWIyNWNlYjFkMGFkOTM1OTRkYWI4YWY0NTRlY2I4YWFiYTgwMg==
 SHA512:
   metadata.gz: !binary |-
-    M2NjMjBhOTgwYjAzMDY2MTA2YTM4OTNmNDM4NGI0OTk2MDdhM2Q0NGJiNmJi
-    MTcwYzE3ZjllODQ5NWQwZTZiNzU3OTA4Yzg3NWY1YWU5MmZhZTdiNmU5ZWI0
-    N2YxNDM5YTdjODgxZTEwN2IwOGNmZWQ4MThjNjUyNzQyYzY0YjM=
+    ZjNmNzNhNDUzYTU2YzBkNmFmYWEyMWQ5Y2I2Mzk3ZDJjZjA3MmUxNGE5ODFm
+    OGEwYjk3N2I1NDQ4MDgyYzNmZDJkODVhZWNlYjA5MDE3M2JhMDBiMzQyMGQ3
+    MWRiODg2NGQ1MzRlNTFjNzQ3MWQ2YWM0MDI4Y2NjODJhNzVmOTQ=
   data.tar.gz: !binary |-
-    OWY1NTc0Yzg5NTEwYTVmZGUxNjkzZTczYjQ5ZDk3NzUzYzg2OGM0ZjdlN2Q5
-    M2Y1YjBmMmM4NTA4YjgwOWVmZGE2YmQ2MjI4NWUzNDM3NTc1NjNmNzg3ZWE0
-    YzJlMTdhMTM3YTg4MGM4ZmU3ZjY1ODZjMTk2ZDc1ZGYwMmQzODc=
+    MjNiNjllYTJiZjU2YWJmNGZiOGJmMDEyMTBiYjNmNzUxOTJlZTQwMmJkZDkx
+    ZDUzYmI5ZjJlMTM1OTBjM2RhYTdhYjdjZGVlMDhlZTY2ODhlMDA0YTI0ZGMz
+    NDhjN2IxODMxOWUwMmI5ZTIzZTExM2UyMjU0MjgwMTBjYmEwNjU=

data/lib/wire/cli/cli_commands.rb

@@ -50,10 +50,10 @@ module Wire
       if cmd_ver_obj.findings.size == 0
         puts 'OK, system is conforming to model'.color(:green)
       else
-        puts 'ERROR, detected inconsistencies/errors:'.color(:red)
-        cmd_ver_obj.findings.each do |val_error|
-          puts val_error.to_s
-        end
+        puts 'ERROR, detected inconsistencies/errors.'.color(:red)
+        # cmd_ver_obj.findings.each do |val_error|
+        #   puts val_error.to_s
+        # end
       end
     end
 

data/lib/wire/commands/base_command.rb

@@ -80,7 +80,7 @@ module Wire
 
         run_on_project
 
-        $log.debug? && pp(@project)
+        $log.debug? && puts(@project.to_yaml)
 
         handle_state_save
 

data/lib/wire/commands/spec_command.rb

@@ -159,82 +159,4 @@ module Wire
       $log.debug("Done for appgroup #{appgroup_name}")
     end
   end
-
-  # SpecWriter is able to create a directory
-  # structure according to basic serverspec
-  # needs and fill in the templates
-  class SpecWriter
-    # create SpecWriter in +target_dir+ directory
-    # with given +spec_contents+
-    def initialize(target_dir, spec_contents)
-      @target_dir = target_dir
-      @spec_contents = spec_contents
-    end
-
-    # writes spec to disk
-    def write
-      ensure_directory_structure
-      ensure_files
-    end
-
-    # make sure that we have a rspec-conformant dir structure
-    def ensure_directory_structure
-      ensure_directory @target_dir
-      ensure_directory File.join(@target_dir, 'spec')
-      ensure_directory File.join(@target_dir, 'spec', 'localhost')
-    end
-
-    # writes erb +template+ to open +file+ object
-    def write_template(template, file)
-      erb = ERB.new(template, nil, '%')
-      file.puts(erb.result(binding))
-    end
-
-    # ensures that all serverspec skeleton files such as
-    # Rakefile, spec_helper etc. exist
-    # Then writes the models specification files into the
-    # skeleton
-    def ensure_files
-      rakefile_name = File.join(@target_dir, 'Rakefile')
-      file?(rakefile_name) || File.open(rakefile_name, 'w') do |file|
-        write_template(SpecTemplates.template_rakefile, file)
-      end
-
-      spechelper_name = File.join(@target_dir, 'spec', 'spec_helper.rb')
-      file?(spechelper_name) || File.open(spechelper_name, 'w') do |file|
-        write_template(SpecTemplates.template_spec_helper, file)
-      end
-
-      specfile_name = File.join(@target_dir, 'spec', 'localhost', 'wire_spec.rb')
-      File.open(specfile_name, 'w') do |file|
-        template = <<ERB
-require 'spec_helper.rb'
-
-# begin of generated specs
-
-<%= @spec_contents.join('\n') %>
-
-# end of spec file
-ERB
-        write_template(template, file)
-      end
-    end
-
-    private
-
-    # make sure that +target_dir+ exists
-    def ensure_directory(target_dir)
-      return if File.exist?(target_dir)
-      begin
-        FileUtils.mkdir_p(target_dir)
-      rescue => excpt
-        $log.error "ERROR: Unable to create #{target_dir}: #{excpt}"
-      end
-    end
-
-    # checks if +target_file+ exists
-    def file?(target_file)
-      File.exist?(target_file) && File.file?(target_file)
-    end
-  end
 end

data/lib/wire/commands/spec_templates.rb

@@ -42,7 +42,7 @@ ERB
            'on ovs bridge named <%= bridge_name %>, serving addresses from ' \
            '<%= ip_start %> to <%= ip_end %>' do
 
-    describe file '/etc/dnsmasq.d/wire__<%= zone_name %>.conf' do
+    describe file '/etc/dnsmasq.d/wire__<%= zone_name %>__<%= bridge_name %>.conf' do
       it { should be_file }
       its(:content) { should match /<%= ip_start %>/ }
       its(:content) { should match /<%= ip_end %>/ }

data/lib/wire/commands/spec_writer.rb

@@ -0,0 +1,86 @@
+# encoding: utf-8
+
+# The MIT License (MIT)
+# Copyright (c) 2014 Andreas Schmidt, andreas@de-wiring.net
+#
+
+# Wire module
+module Wire
+  # SpecWriter is able to create a directory
+  # structure according to basic serverspec
+  # needs and fill in the templates
+  class SpecWriter
+    # create SpecWriter in +target_dir+ directory
+    # with given +spec_contents+
+    def initialize(target_dir, spec_contents)
+      @target_dir = target_dir
+      @spec_contents = spec_contents
+    end
+
+    # writes spec to disk
+    def write
+      ensure_directory_structure
+      ensure_files
+    end
+
+    # make sure that we have a rspec-conformant dir structure
+    def ensure_directory_structure
+      ensure_directory @target_dir
+      ensure_directory File.join(@target_dir, 'spec')
+      ensure_directory File.join(@target_dir, 'spec', 'localhost')
+    end
+
+    # writes erb +template+ to open +file+ object
+    def write_template(template, file)
+      erb = ERB.new(template, nil, '%')
+      file.puts(erb.result(binding))
+    end
+
+    # ensures that all serverspec skeleton files such as
+    # Rakefile, spec_helper etc. exist
+    # Then writes the models specification files into the
+    # skeleton
+    def ensure_files
+      rakefile_name = File.join(@target_dir, 'Rakefile')
+      file?(rakefile_name) || File.open(rakefile_name, 'w') do |file|
+        write_template(SpecTemplates.template_rakefile, file)
+      end
+
+      spechelper_name = File.join(@target_dir, 'spec', 'spec_helper.rb')
+      file?(spechelper_name) || File.open(spechelper_name, 'w') do |file|
+        write_template(SpecTemplates.template_spec_helper, file)
+      end
+
+      specfile_name = File.join(@target_dir, 'spec', 'localhost', 'wire_spec.rb')
+      File.open(specfile_name, 'w') do |file|
+        template = <<ERB
+require 'spec_helper.rb'
+
+# begin of generated specs
+
+<%= @spec_contents.join('\n') %>
+
+# end of spec file
+ERB
+        write_template(template, file)
+      end
+    end
+
+    private
+
+    # make sure that +target_dir+ exists
+    def ensure_directory(target_dir)
+      return if File.exist?(target_dir)
+      begin
+        FileUtils.mkdir_p(target_dir)
+      rescue => excpt
+        $log.error "ERROR: Unable to create #{target_dir}: #{excpt}"
+      end
+    end
+
+    # checks if +target_file+ exists
+    def file?(target_file)
+      File.exist?(target_file) && File.file?(target_file)
+    end
+  end
+end

data/lib/wire/commands.rb

@@ -11,6 +11,7 @@ require_relative 'commands/validate_command.rb'
 require_relative 'commands/verify_command.rb'
 require_relative 'commands/verify_command_handler.rb'
 require_relative 'commands/spec_command.rb'
+require_relative 'commands/spec_writer.rb'
 require_relative 'commands/spec_templates.rb'
 require_relative 'commands/updown_command_base.rb'
 require_relative 'commands/up_command.rb'

data/lib/wire/resource/network_injection.rb

@@ -35,18 +35,29 @@ module Wire
         self.containers = containers
         self.networks = networks
 
-        # TODO: make configurable
-        @executables = {
-          :network => '/usr/local/bin/wire-network-container.sh'
-        }
+        begin
+          # try to locate the gem base path and find shell script
+          gem 'dewiring'
+          gem_base_dir = Gem.datadir('dewiring').split('/')[0..-3].join('/')
+          @executables = {
+            :network => File.join(gem_base_dir, 'lib/wire-network-container.sh')
+          }
+        rescue LoadError
+          # use fallback
+          @executables = {
+            :network => '/usr/local/bin/wire-network-container.sh'
+          }
+        end
+        $log.debug "Using network injection script #{@executables[:network]}"
       end
 
       # calls helper executable with correct +action+
       # and given +command_arr+ array
-      def with_helper(action, params)
+      def with_helper(action, params, options = '')
         # puts "#{@executables[:network]} #{action} --debug -- #{params.join(' ')}"
+        dbg_param = ($log.level == Logger::DEBUG ? '--debug' : '')
         LocalExecution.with(@executables[:network],
-                            [action, '--debug', '--', params].flatten,
+                            [action, dbg_param, options, '--', params].flatten,
                             { :b_sudo => false, :b_shell => false }) do |exec_obj|
           yield exec_obj
         end
@@ -75,7 +86,7 @@ module Wire
       # same as exist?
       def up?
         with_helper('verify', [construct_helper_params,
-                               containers.join(' ')]) do |exec_obj|
+                               containers.join(' ')], '--quiet') do |exec_obj|
           exec_obj.run
 
           return (exec_obj.exitstatus == 0 && count_errors(exec_obj) == 0)

data/lib/wire/version.rb

@@ -9,6 +9,6 @@ module Wire
   # Wire Version information
   module WireVersion
     # current version
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/{bin → lib}/wire-network-container.sh

@@ -1,10 +1,16 @@
 #!/bin/bash
 #
-# attach-container.sh
+# wire-network-container.sh
 # MIT License
 # 
 # attaches multiple containers to multiple ovs bridges
-#
+# exit codes:
+# 0     action completed successfully
+# 1     unknown option/action or no action given
+# 2     No device/bridge part specified.
+# 3     No container ids specified.
+# 10    No running containers found.
+# 100   action failed
 
 # Display usage and help
 function usage() {
@@ -13,13 +19,15 @@ function usage() {
         echo '    verify        verify given container/device/bridge options'
         echo '    attach        attach devices to bridges and containers'
         echo '    detach        detach devices from bridges and containers'
-	echo '  where OPTIONS are'
- 	echo '    -n/--noop 	only print commands, do not change'
- 	echo '    -d/--debug 	show debug output'
-	echo '  Examples:'
-	echo '   attach-containers.sh attach -- eth1:br1 eth2:br2 02978729 12673482'
-	echo '   attach-containers.sh verify -- eth1:br1 eth2:br2 02978729 12673482'
-	echo '   attach-containers.sh detach -- eth1:br1 eth2:br2 02978729 12673482'
+	    echo '  where OPTIONS are'
+ 	    echo '    -n/--noop 	only print commands, do not change'
+ 	    echo '    -d/--debug 	show debug output'
+ 	    echo '    -q/--quiet 	be quiet'
+ 	    # echo '    -s/--state <FILE>   write state to <FILE>'  # TODO
+	    echo '  Examples:'
+	    echo '   attach-containers.sh attach --debug -- eth1:br1 eth2:br2 02978729 12673482'
+	    echo '   attach-containers.sh verify -- eth1:br1 eth2:br2 02978729 12673482'
+	    echo '   attach-containers.sh detach -q -- eth1:br1 eth2:br2 02978729 12673482'
 }
 
 
@@ -45,7 +53,7 @@ function debug() {
 	[[ "$QUIET" != "1" ]] && echo DEBUG $* 
 }
 function log_error() {
-	echo ERROR $* >&2
+	[[ "$QUIET" != "1" ]] && echo ERROR $* >&2
 }
 function log_ok() {
 	[[ "$QUIET" != "1" ]] && echo OK $* 
@@ -55,6 +63,7 @@ NOOP=
 MODE=
 ACTION=
 DEBUG=nodebug
+QUIET=
 
 while :
 do
@@ -69,15 +78,19 @@ do
           ;;
       -n | --noop)
           NOOP=1
-	  shift
+	      shift
           ;;
       -d | --debug)
           DEBUG=debug
-	  shift
+	      shift
+          ;;
+      -q | --quiet)
+          QUIET=1
+	      shift
           ;;
       --) # End of all options
           shift
-	  break
+	      break
           ;;
       -*)
           echo "Error: Unknown option: $1" >&2
@@ -102,6 +115,8 @@ if [[ -z "$DEVICE_ARR" ]]; then
 	log_error No device/bridge part specified.
 	usage
 	exit 2
+else
+    $DEBUG Attaching devices/bridges "$DEVICE_ARR"
 fi
 if [[ -z "$ID_ARR" ]]; then
 	log_error No container ids specified.
@@ -119,6 +134,7 @@ PS4='+|${BASH_SOURCE##*/} ${LINENO}${FUNCNAME[0]:+ ${FUNCNAME[0]}}| '
 IP=$(which ip)
 OVS_VSCTL=$(which ovs-vsctl)
 DOCKER=$(which docker)
+DHCLIENT=$(which dhclient)
 
 # -- FUNCTION ----------------------------------------------------------------
 #        Name: container_process
@@ -304,7 +320,7 @@ function has_interfaces() {
 function dhcp_container() {
 	local NS=$1
 	local DEVICE=$2
-	$MODE sudo $IP netns exec $NS dhclient -v -1 $DEVICE
+	$MODE sudo "$IP" netns exec "$NS" "$DHCLIENT" -v -1 "$DEVICE"
 	return $?
 }
 
@@ -323,20 +339,20 @@ function handle_verify() {
 	local RES=0
 
 	# ensure there are containers running before continuing
-	CURRENT_IDS=$(sudo $DOCKER ps -q --no-trunc)
+	CURRENT_IDS=$(sudo "$DOCKER" ps -q --no-trunc)
 	if [[ -z "$CURRENT_IDS" ]]; then
 		log_error No running containers found.
 		exit 10
 	fi
 
 	for DEVICE_PAIR in $DEVICE_ARR; do
-		BRIDGE=$(echo $DEVICE_PAIR | awk -F':' '{ print $2 }' )
-		$DEBUG Checking $BRIDGE
-		sudo $OVS_VSCTL br-exists $BRIDGE 
+		BRIDGE=$(echo "$DEVICE_PAIR" | awk -F':' '{ print $2 }' )
+		$DEBUG Checking "$BRIDGE"
+		sudo "$OVS_VSCTL" br-exists "$BRIDGE"
 		if [[ $? -eq 0 ]]; then
-			log_ok $BRIDGE
+			log_ok "$BRIDGE"
 		else
-			log_error Unable to find ovs bridge $BRIDGE
+			log_error Unable to find ovs bridge "$BRIDGE"
 			RES=1
 		fi
 	done
@@ -400,9 +416,9 @@ function handle_attach() {
 		$DEBUG Attaching $TARGET
 	
 		TARGET_PID=$(container_process $TARGET)
-        	$DEBUG PID of $TARGET is $TARGET_PID
+        $DEBUG PID of $TARGET is $TARGET_PID
         
-        	link_netns ${TARGET_PID}
+        link_netns "${TARGET_PID}"
         
 		# iterate given devices
 		for DEVICE_PAIR in $DEVICE_ARR; do
@@ -417,12 +433,12 @@ function handle_attach() {
 				break	
 			fi
 
-        		HOST_IFNAME=v${INTF}h${TARGET_PID}
-        		CONTAINER_IFNAME=v${INTF}c${TARGET_PID}
-        		$DEBUG - interface pair names are ${HOST_IFNAME}/${CONTAINER_IFNAME}
+            HOST_IFNAME=v${INTF}h${TARGET_PID}
+            CONTAINER_IFNAME=v${INTF}c${TARGET_PID}
+            $DEBUG - interface pair names are ${HOST_IFNAME}/${CONTAINER_IFNAME}
 
 			$DEBUG - creating peer interfaces
-        		add_peer_interfaces $HOST_IFNAME $CONTAINER_IFNAME $BRIDGEDEV_MTU
+        	add_peer_interfaces "$HOST_IFNAME" "$CONTAINER_IFNAME" "$BRIDGEDEV_MTU"
 			if [[ $? -ne 0 ]]; then	
 				log_error creating peer interfaces. aborting
 				RES=1
@@ -430,7 +446,7 @@ function handle_attach() {
 			fi
         
 			$DEBUG - adding $HOST_IFNAME to $BRIDGE
-        		add_device_to_switch $HOST_IFNAME $BRIDGE
+        	add_device_to_switch "$HOST_IFNAME" "$BRIDGE"
 			if [[ $? -ne 0 ]]; then	
 				log_error adding device to bridge. aborting
 				RES=1
@@ -438,7 +454,7 @@ function handle_attach() {
 			fi
         
 			$DEBUG - configuring interfaces
-        		configure_interfaces $HOST_IFNAME $CONTAINER_IFNAME $TARGET_PID $INTF
+        	configure_interfaces "$HOST_IFNAME" "$CONTAINER_IFNAME" "$TARGET_PID" "$INTF"
 			if [[ $? -ne 0 ]]; then	
 				log_error configuring interfaces. aborting
 				RES=1
@@ -446,7 +462,7 @@ function handle_attach() {
 			fi
         	
 			$DEBUG - dhcp requesting address
-        		dhcp_container $TARGET_PID $INTF
+        	dhcp_container "$TARGET_PID" "$INTF"
 			if [[ $? -ne 0 ]]; then	
 				log_error running dhcp. aborting
 				RES=1
@@ -454,7 +470,7 @@ function handle_attach() {
 			fi
         	done
 
-        	unlink_netns $TARGET_PID
+        	unlink_netns "$TARGET_PID"
 	done
 
 	return $RES
@@ -483,12 +499,12 @@ function handle_detach() {
 			INTF=$(echo $DEVICE_PAIR | awk -F':' '{ print $1 }' )
 			BRIDGE=$(echo $DEVICE_PAIR | awk -F':' '{ print $2 }' )
         	
-        		HOST_IFNAME=v${INTF}h${TARGET_PID}
-        		CONTAINER_IFNAME=v${INTF}c${TARGET_PID}
-        		$DEBUG - interface pair names are ${HOST_IFNAME}/${CONTAINER_IFNAME}
+            HOST_IFNAME=v${INTF}h${TARGET_PID}
+            CONTAINER_IFNAME=v${INTF}c${TARGET_PID}
+            $DEBUG - interface pair names are ${HOST_IFNAME}/${CONTAINER_IFNAME}
 
 			$DEBUG - removing $HOST_IFNAME from $BRIDGE
-        		remove_device_from_switch $HOST_IFNAME $BRIDGE
+        	remove_device_from_switch "$HOST_IFNAME" "$BRIDGE"
 			if [[ $? -ne 0 ]]; then	
 				log_error removing device from bridge. aborting
 				RES=1
@@ -496,7 +512,7 @@ function handle_detach() {
 			fi
 
 			$DEBUG - delete interfaces 
-        		delete_interfaces $HOST_IFNAME $CONTAINER_IFNAME $TARGET_PID $INTF
+        	delete_interfaces "$HOST_IFNAME" "$CONTAINER_IFNAME" "$TARGET_PID" "$INTF"
 			if [[ $? -ne 0 ]]; then	
 				log_error deleting interfaces
 				RES=1
@@ -504,7 +520,7 @@ function handle_detach() {
 			fi
         	done
 
-        	unlink_netns $TARGET_PID
+        	unlink_netns "$TARGET_PID"
 	done
 
 	return $RES

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dewiring
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Andreas Schmidt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -43,13 +43,11 @@ description: System and Network architecture generator
 email: gem@de-wiring.net
 executables:
 - wire
-- wire-network-container.sh
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/wire
-- bin/wire-network-container.sh
-- lib/test_fig.rb
+- lib/wire-network-container.sh
 - lib/wire.rb
 - lib/wire/cli.rb
 - lib/wire/cli/cli_commands.rb
@@ -62,6 +60,7 @@ files:
 - lib/wire/commands/init_interactive.rb
 - lib/wire/commands/spec_command.rb
 - lib/wire/commands/spec_templates.rb
+- lib/wire/commands/spec_writer.rb
 - lib/wire/commands/up_command.rb
 - lib/wire/commands/up_command_handler.rb
 - lib/wire/commands/updown_command_base.rb

data/lib/test_fig.rb

@@ -1,46 +0,0 @@
-# encoding: utf-8
-
-# The MIT License (MIT)
-# Copyright (c) 2014 Andreas Schmidt, andreas@de-wiring.net
-#
-
-require 'rubygems'
-
-#
-# modules
-#
-require_relative 'wire/common.rb'
-require_relative 'wire/cli.rb'
-require_relative 'wire/commands.rb'
-require_relative 'wire/model.rb'
-require_relative 'wire/execution.rb'
-require_relative 'wire/resource.rb'
-
-include Wire
-
-$log.level = Logger::DEBUG
-
-fa = Wire::Resource::FigAdapter.new('wiredmz', 'test/d1/fig/fig_dmz.yaml')
-pp fa
-
-$log.info 'Checking if containers are up'
-r = fa.up?
-$log.info "Result=#{r}"
-
-$log.info 'Bringing it up...'
-r = fa.up
-$log.info "Result=#{r}"
-
-$log.info 'Checking if containers are up'
-r = fa.up?
-$log.info "Result=#{r}"
-
-$log.info "IDs=#{fa.up_ids}"
-
-$log.info 'Taking it down...'
-r = fa.down
-$log.info "Result=#{r}"
-
-$log.info 'Checking if containers are up'
-r = fa.up?
-$log.info "Result=#{r}"