staypuft 0.4.7 → 0.4.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDMxMmJlMWYzNTNkM2ZiZDdlZjQ3ODllNjAxNTYxOTM2OWU0ZDRlNA==
+    NzQ3MmEzM2QyZmU1YmJhYzkxYjY2NWNhZWE5NGE3ZjNhY2M3Zjk2MQ==
   data.tar.gz: !binary |-
-    NzQ4ZmMzNmMzMGM0NTZmMWZmZDNhNTE4NWNkNTJmZmI0MmZkM2FmNg==
+    MmQxYjQ4MmI4YTAzMjYwMmIwOWYwZGU2ZDZjMmIzOTQwMjkxNmYwYw==
 SHA512:
   metadata.gz: !binary |-
-    N2E4MGMxMjY4N2ViMjc3NzBkYWM1ZTJkYmY0N2Q4ODQ1YjM1MTc4ZTcxZmE3
-    ZWQzOGRmOTgzZmQ5YjhmM2ZlOTc2NWM4NDhjMzE5ODg2MTI0MTk3NTU5MTVl
-    MGIyYzcyMzY5ODk0ZDMzMmViMWEzYzI3NTM3Y2NjZWE4ODk4ZTc=
+    OGJlYjI5MmRkYjE5MDBlMTEwNWIwNzdlYmUyOTU4NTNkOGQ4MDgxNzJiNDc3
+    OGU2YzQ1NjBiNjMxMmYzMWVhNWNmYWFhN2E4YjEwYzUwN2FiYmYyZGY1ODU3
+    ZmJlNzBiZWU5ODZkMWU4YzBmMjA2OWRkYTE4ZDU1YWY1MjlmZWE=
   data.tar.gz: !binary |-
-    NDQwYTczZmI5NDI5M2Q5NmM1MWZlODk3Njc2YmVhMGU4MzgzM2Y1MTVkM2U1
-    NTZjNDE0NmY0MGM0NTE5YmIyYmI3MWMwNTVmOWYxODVlOGRlZmE3MTJjNDAy
-    NmNhYWZkMGQxZjM2MTNkNTU5MTMxMzdjNjkwZGM5MDhjYzc2MWU=
+    NGMwZjBjMjM0MWFmOWI5NzA3ZDczYzgzNmNmMmI1MWQzMmJjNTk5YzMyNTM2
+    YzMxZTcwZTJmOWYzYjQ4ZDA0NmE4OTJjZjdjOWI5YmI0NzRlZTUwM2E4MGZj
+    M2ViMDY3YmQ2ZTJhYmU1M2UyODQyOTA5NjI1YTE3OTJiMWYyNjk=

data/app/controllers/staypuft/subnet_typings_controller.rb

@@ -7,6 +7,7 @@ module Staypuft
       @subnet = Subnet.find(params[:subnet_id])
       check_for_existing_assignments
       check_for_ip_management
+      check_public_api_for_default_gateway
       check_for_unsharable_subnet_types
       @subnet_typing = @deployment.subnet_typings.new(:subnet_id => @subnet.id, :subnet_type_id => @subnet_type.id)
       @saved = @errors.blank? ? @subnet_typing.save : false
@@ -20,6 +21,7 @@ module Staypuft
       @subnet = Subnet.find(params[:subnet_id])
       check_for_existing_assignments
       check_for_ip_management
+      check_public_api_for_default_gateway
       check_for_unsharable_subnet_types
       @subnet_typing.subnet = @subnet
       @saved = @errors.blank? ? @subnet_typing.save : false
@@ -63,7 +65,7 @@ module Staypuft
     def check_for_unsharable_subnet_types
       # if subnet type is unsharable, make sure nothing else is already assigned here
       if @subnet_type.dedicated_subnet
-        if @deployment.subnet_typings.where(:subnet_id => @subnet.id).size > 0 
+        if @deployment.subnet_typings.where(:subnet_id => @subnet.id).size > 0
           @errors[@subnet_type.name] = ["Subnet cannot be shared with other traffic types in this deployment."]
           false
         else
@@ -72,7 +74,7 @@ module Staypuft
       #otherwise make sure there's no existing unsharable type already here
       else
         existing_dedicated_types = @deployment.subnet_typings.includes(:subnet_type).where(:subnet_id => @subnet.id, "staypuft_subnet_types.dedicated_subnet" => true)
-        if existing_dedicated_types.size > 0 
+        if existing_dedicated_types.size > 0
           @errors[existing_dedicated_types.first.subnet_type.name] = ["Subnet cannot be shared with other traffic types in this deployment."]
           false
         else
@@ -80,5 +82,11 @@ module Staypuft
         end
       end
     end
+
+    def check_public_api_for_default_gateway
+      if @subnet_type.name == Staypuft::SubnetType::PUBLIC_API && @subnet.gateway.empty?
+        @errors[@subnet_type.name] = ["Subnet must have a default gateway defined."]
+      end
+    end
   end
 end

data/app/overrides/nic_base_form.rb

@@ -7,5 +7,5 @@ end
 
 Deface::Override.new(:virtual_path => "nic/_base_form",
                      :name => "add_network_types_to_subnet",
-                     :replace => "erb[loud]:contains(':subnet_id')",
+                     :replace => "#{erb_tag}:contains(':subnet_id')",
                      :template => "nic/_subnet_id_field")

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks