From 4524e01441e805fdb12eae70fceed905dea04a08 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@global.leaseweb.com>
Date: Mon, 20 May 2019 13:28:52 +0000
Subject: [PATCH 1/2] ui: fix enable static nat only towards primary interface
 and not on any other interface

---
 ui/scripts/network.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f5be8498c98d..34b68f246870 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -91,7 +91,7 @@
                 url: createURL('listNics'),
                 data: {
                     virtualmachineid: instance.id,
-                    networkId: network.id
+                    networkid: (args.context.networkid != undefined) ? args.context.networkid : network.id
                 },
                 success: function(json) {
                     var nic = json.listnicsresponse.nic[0];
@@ -2465,6 +2465,10 @@
                                                             networkid: $tierSelect.val(),
                                                             vpcid: args.context.vpc[0].id
                                                         });
+                                                        $.extend(args.context, {
+                                                            networkid: $tierSelect.val(),
+                                                            vpcid: args.context.vpc[0].id
+                                                        });
                                                     } else if ('networks' in args.context && !args.context.ipAddresses[0].isportable) {
                                                         $.extend(data, {
                                                             networkid: args.context.networks[0].id

From 3882758945f41a193ba8a958a8345f00f276c857 Mon Sep 17 00:00:00 2001
From: Wei Zhou <w.zhou@global.leaseweb.com>
Date: Mon, 20 May 2019 13:29:36 +0000
Subject: [PATCH 2/2] ui: fix add internal load balancer only towards Primary
 interface and not on any other interface

---
 ui/scripts/vpc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 0d38ed4c3f2c..3ce0a9f6f938 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -39,7 +39,7 @@
                             url: createURL('listNics'),
                             data: {
                                 virtualmachineid: instance.id,
-                                nicId: instance.nic[0].id
+                                networkId: network.id
                             },
                             success: function(json) {
                                 var nic = json.listnicsresponse.nic[0];