sakurraform 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2789e5c4f89556a579e74af00b800dcf01b460d9
-  data.tar.gz: 66a5d6c506918995fd0ffa11824d3fa90a2b8d1a
+  metadata.gz: a3cce78309426bf6755b1fbf2d3cfca419611c7a
+  data.tar.gz: eea0d179c2a9f170c40ad87b8be7f0f221fbc76a
 SHA512:
-  metadata.gz: 3d53a035d553493257c5a15af8040e1185a7b8b5687c0a5fb3e28bea2420f30beeef1cf22279c995030585122fc72f550d5eb685ef80fa60e83684c2578e30d3
-  data.tar.gz: cf28520c2456bd8ef03a4d6b391ae8a835606ed8bb18a4729e04a8644bf83f14a7dca9389d30de09e6dc7837901f8278c2588943d29956774cb3324a666f73be
+  metadata.gz: 17348e6c25ad8d48838ef40361c5724dc59283da47a23f77da8af73210106a54615c9b5c093333e6532b09d11132e446e467c5624f85df54ddb38595fded94b8
+  data.tar.gz: 8f856f4d79dbf7420a690786359c570ff7213d2eaaad2e0c1792e67040da569293ac1cdbe835dd9d18be61066216b902aaf82751ca7f7a923ba2da1524236842

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG of sakurraform
 
+## Not release or WIP
+
+## v0.4.0
+
+- Support Simple L2 Switch
+- Support add interfaces for server.
+- SUpport connect interfaces to switch.
+
 ## v0.3.0
 
 - Fix: build status crashes if other resources exists.

data/lib/sakurraform/cli/plan.rb

@@ -27,9 +27,16 @@ module SakurraForm
         unless net.resource_id
           net.resource_id = name_plus_uuid(net.name)
           options = net.configuration.first.merge({'name' => net.resource_id})
-          say("Create new network #{net.name}")
-          router = network.routers.create(options)
-          switch = network.switches.find {|s| s.id == router.id}
+          say("Create new #{net.mode} #{net.name}")
+          case net.mode
+          when 'router'
+            router = network.routers.create(options)
+            switch = network.switches.find {|s| s.id == router.id}
+          when 'switch'
+            switch = network.switches.create(options)
+          else
+            raise "Not supported mode #{net.mode}..."
+          end
           create_file "state/network/#{net.resource_id}.yml", switch.all_attributes.to_yaml
         else
           say("#{net.name} already available as #{net.resource_id}")
@@ -68,6 +75,20 @@ module SakurraForm
           disk_id = server.disks.first['ID']
           say("Associate #{sv_ipaddress} to #{sv.name}")
           volume.associate_ip_to_disk(disk_id, subnet)
+
+          ## Regist Interfaces
+          if sv.configuration.first["interfaces"]
+            ifs = sv.configuration.first["interfaces"]
+            c_switches = ifs.map do |target_sw|
+              say("Creating interface connected to #{target_sw}...")
+              resolve_sakura_id_by_combined(target_sw)
+            end
+            c_switches.map do |t_sw|
+              new_if = network.interfaces.regist_onto_server(server.id)
+              network.interfaces.connect_to_switch(new_if.id, t_sw)
+            end
+          end
+
           server.boot
           create_file "state/server/#{sv.resource_id}.yml", server.all_attributes.to_yaml
         else
@@ -124,7 +145,7 @@ module SakurraForm
       col_networks.resources.each do |net|
         if net.remote_state
           # puts net.remote_state
-          if net.remote_state[:internet].any?
+          if net.remote_state[:internet] && net.remote_state[:internet].any?
             say("Deleting Router #{net.resource_id} ...")
             network.delete_router(net.remote_state[:internet]["ID"])
           else

data/lib/sakurraform/cli/status.rb

@@ -19,7 +19,7 @@ module SakurraForm
         output["Networks"] = build_state_network(col_network)
       else
         Formatador.display_line('[green]Nework resources[/]')
-        Formatador.display_table(build_state_network(col_network), [:name, :sakurraform_name, :sakura_id, :subnets, :gateway])
+        Formatador.display_table(build_state_network(col_network), [:name, :mode, :sakurraform_name, :sakura_id, :subnets, :gateway])
         say()
       end
 
@@ -31,7 +31,7 @@ module SakurraForm
         say(JSON.pretty_generate(output))
       else
         Formatador.display_line('[green]Server resources[/]')
-        Formatador.display_table(build_state_server(col_server), [:name, :sakurraform_name, :sakura_id, :ipaddress, :status, :last_state_changed])
+        Formatador.display_table(build_state_server(col_server), [:name, :sakurraform_name, :sakura_id, :ipaddress, :network, :status, :last_state_changed])
       end
       if options[:sync]
         col_server.resources.each do |r|

data/lib/sakurraform/helper.rb

@@ -52,10 +52,13 @@ module SakurraForm
         table_datum = {}
 #        pp resource
         table_datum[:name] = resource.name
+        table_datum[:mode] = resource.mode
         table_datum[:sakurraform_name] = resource.resource_id ? resource.resource_id : 'not created'
         table_datum[:sakura_id] = resource.remote_state ? resource.remote_state[:id] : 'not created'
-        table_datum[:subnets] = resource.remote_state && resource.remote_state[:subnets] ? resource.remote_state[:subnets].first['NetworkAddress'] + '/' + resource.remote_state[:subnets].first['NetworkMaskLen'].to_s  : 'not created'
-        table_datum[:gateway] = resource.remote_state && resource.remote_state[:subnets] ? resource.remote_state[:subnets].first['DefaultRoute'] : 'not created'
+        if resource.mode == 'router'
+          table_datum[:subnets] = resource.remote_state && resource.remote_state[:subnets] ? resource.remote_state[:subnets].first['NetworkAddress'] + '/' + resource.remote_state[:subnets].first['NetworkMaskLen'].to_s  : 'not created'
+          table_datum[:gateway] = resource.remote_state && resource.remote_state[:subnets] ? resource.remote_state[:subnets].first['DefaultRoute'] : 'not created'
+        end
 
         table_data << table_datum
       end
@@ -66,7 +69,7 @@ module SakurraForm
       table_data = []
       col_server.resources.each do |resource|
         table_datum = {}
-#        pp resource
+        # pp resource
         table_datum[:name] = resource.name
         table_datum[:sakurraform_name] = resource.resource_id ? resource.resource_id : 'not created'
         table_datum[:sakura_id] = resource.remote_state ? resource.remote_state[:id] : 'not created'
@@ -74,6 +77,8 @@ module SakurraForm
         table_datum[:last_state_changed] = resource.remote_state && resource.remote_state[:instance] ? resource.remote_state[:instance]['StatusChangedAt'] : 'not created'
         table_datum[:ipaddress] = resource.remote_state && resource.remote_state[:interfaces] ? resource.remote_state[:interfaces].first['UserIPAddress'] : 'not created'
 
+        table_datum[:network] = resource.remote_state && resource.remote_state[:interfaces] ? resource.remote_state[:interfaces].map {|i| i['Switch']['ID'] } : 'not created'
+
         table_data << table_datum
       end
       table_data

data/lib/sakurraform/resource/network.rb

@@ -1,6 +1,16 @@
 module SakurraForm
   class Resource
     class Network < SakurraForm::Resource::Base
+      attr_reader :mode
+      def initialize(name, enable_remote = false)
+        super
+        if @configuration.first.has_key?(:networkmasklen)
+          @mode = 'router'
+        else
+          @mode = 'switch'
+        end
+      end
+
       def collect_remote_state
         return {} unless @resource_id
         network = Fog::Network[:sakuracloud]

data/lib/sakurraform/templates/network.tt

@@ -2,6 +2,5 @@
 network:
   - name: defaultrouter
     networkmasklen: 28
-  - name: defaultrouter2
-    networkmasklen: 28
+  - name: localswitch1
 

data/lib/sakurraform/templates/server.tt

@@ -7,6 +7,8 @@ server:
       diskplan: 4
       sourcearchive: 112500463685
     switch: network[defaultrouter]
+    interfaces:
+      - network[localswitch1]
     meta:
       network_offset: 3
       chef_environment: null
@@ -20,6 +22,8 @@ server:
       diskplan: 4
       sourcearchive: 112500463685
     switch: network[defaultrouter]
+    interfaces:
+      - network[localswitch1]
     meta:
       network_offset: 4
       chef_environment: null

data/lib/sakurraform/version.rb

@@ -1,3 +1,3 @@
 module SakurraForm
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sakurraform
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - sawanoboly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor