silk-daemon job accepts vxlan_interface argument

[#155197416] Signed-off-by: Tyler Schultz <[email protected]>
cloudfoundry · Feb 27, 2018 · 9c9e6e8 · 9c9e6e8
1 parent 1d280ad
commit 9c9e6e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/jobs/silk-daemon/spec b/jobs/silk-daemon/spec
@@ -63,3 +63,6 @@ properties:
   silk_controller.listen_port:
     description: "Silk controller handles requests from the silk daemon on this port."
     default: 4103
+
+  vxlan_interface:
+    description: "Name of network interface which container traffic is sent to. If empty, the default network interface is used."
diff --git a/jobs/silk-daemon/templates/client-config.json.erb b/jobs/silk-daemon/templates/client-config.json.erb
@@ -1,10 +1,6 @@
 <%=
   require 'json'
 
-  def param_exists? param
-    p(param) != ""
-  end
-
   def subnet_prefix_length
     size = link("cf_network").p("subnet_prefix_length")
     if size < 1 || size > 30
@@ -38,6 +34,7 @@
     "metron_port" => p("metron_port"),
     "vtep_port" => p("vtep_port"),
     "log_prefix" => "cfnetworking",
+    "custom_underlay_interface_name" => p("vxlan_interface", ""),
   }
 
   JSON.pretty_generate(toRender)

diff --git a/src/code.cloudfoundry.org/silk b/src/code.cloudfoundry.org/silk
+19 −18		client/config/config.go
+16 −0		client/config/config_test.go
+12 −0		daemon/integration/error_cases_test.go
+30 −0		daemon/integration/integration_test.go
+17 −5		daemon/vtep/config_creator.go
+28 −0		daemon/vtep/config_creator_test.go
+72 −2		daemon/vtep/fakes/netAdapter.go
+6 −2		daemon/vtep/fakes/netlinkAdapter.go
+4 −0		lib/adapter/net_adapter.go