From 944eea2ba2e62bf78e166514444bb5e48d13f16b Mon Sep 17 00:00:00 2001 From: mah88 Date: Mon, 18 Dec 2017 17:15:36 +0100 Subject: [PATCH 1/4] Removing OS Compute Hypervisors list request --- src/main/java/org/openbaton/nse/beans/core/CoreModule.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java index 798ae2c..5750abd 100755 --- a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java +++ b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java @@ -401,9 +401,9 @@ private String getNeutronEndpoint(OSClient os, VimInstance vimInstance, String t private Map getComputeNodeMap(OSClient os) { Map computenode_ip_map = new HashMap(); - for (Hypervisor h : os.compute().hypervisors().list()) { - computenode_ip_map.put(h.getHypervisorHostname(), h.getHostIP()); - } + // for (Hypervisor h : os.compute().hypervisors().list()) { + // computenode_ip_map.put(h.getHypervisorHostname(), h.getHostIP()); + // } return computenode_ip_map; } From 40ff7dcec70e152290b87a2e020a77a8ef0e9967 Mon Sep 17 00:00:00 2001 From: mah88 Date: Mon, 18 Dec 2017 17:52:07 +0100 Subject: [PATCH 2/4] Update CoreModule.java --- .../openbaton/nse/beans/core/CoreModule.java | 29 ------------------- 1 file changed, 29 deletions(-) diff --git a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java index 5750abd..a0cc3a1 100755 --- a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java +++ b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java @@ -399,13 +399,6 @@ private String getNeutronEndpoint(OSClient os, VimInstance vimInstance, String t return null; } - private Map getComputeNodeMap(OSClient os) { - Map computenode_ip_map = new HashMap(); - // for (Hypervisor h : os.compute().hypervisors().list()) { - // computenode_ip_map.put(h.getHypervisorHostname(), h.getHostIP()); - // } - return computenode_ip_map; - } private Map getVnfHostNameComputeNodeMap( OSClient os, Set vnfrs) { @@ -440,7 +433,6 @@ private void startOpenStackNeutronQoSTask( v, creds, portList, - this.getComputeNodeMap(os), this.getVnfHostNameComputeNodeMap(os, vim_vnfrs_map.get(key))); qtScheduler.schedule(aqe, 1, TimeUnit.SECONDS); } @@ -512,27 +504,6 @@ private void updateOpenStackOverview() { for (VNFCInstance vnfci : vdu.getVnfc_instance()) { VimInstance tmp_vim = this.getVimInstance(nfvo_nsr_req, vnfci.getVim_id()); OSClient tmp_os = getOSClient(tmp_vim); - Map tmp_computeNodeMap = getComputeNodeMap(tmp_os); - if (tmp_computeNodeMap != null) { - // We collect all involved compute nodes - for (String key : tmp_computeNodeMap.keySet()) { - boolean node_found = false; - for (int i = 0; i < complete_computeNodeMap.size(); i++) { - if (complete_computeNodeMap.get(i).get("name").equals(key)) { - node_found = true; - } - } - if (!node_found) { - HashMap tmp_node_entry = new HashMap(); - //tmp_node_entry.put(key, tmp_computeNodeMap.get(key)); - tmp_node_entry.put("vnfs", new ArrayList>()); - tmp_node_entry.put("node_ip", tmp_computeNodeMap.get(key)); - tmp_node_entry.put("name", key); - - complete_computeNodeMap.add(tmp_node_entry); - } - } - } Map tmp_vnf_computeNodeMap = getVnfHostNameComputeNodeMap(tmp_os, nsr.getVnfr()); From 9aa2d8d3996e142331e7877f733f3086ff17dfc2 Mon Sep 17 00:00:00 2001 From: mah88 Date: Mon, 18 Dec 2017 17:56:24 +0100 Subject: [PATCH 3/4] Removing ComputeNodeMap removing computeNodeMap since it depends on the OS compute hupervisors list request --- .../nse/beans/adapters/openstack/NeutronQoSExecutor.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java b/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java index 6b01532..d92c57b 100755 --- a/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java +++ b/src/main/java/org/openbaton/nse/beans/adapters/openstack/NeutronQoSExecutor.java @@ -68,7 +68,6 @@ public class NeutronQoSExecutor implements Runnable { private String token; private Map creds; private List portList; - private Map computeNodeMap; private Map hostComputeNodeMap; private String delimiter_line; @@ -79,7 +78,6 @@ public NeutronQoSExecutor( VimInstance v, Map creds, List portList, - Map computeNodeMap, Map hostComputeNodeMap) { this.vnfrs = vnfrs; this.logger = LoggerFactory.getLogger(this.getClass()); @@ -88,7 +86,6 @@ public NeutronQoSExecutor( this.v = v; this.creds = creds; this.portList = portList; - this.computeNodeMap = computeNodeMap; this.hostComputeNodeMap = hostComputeNodeMap; } @@ -120,15 +117,12 @@ public void run() { + " -> " + r.getQuality() + " -> " - + hostComputeNodeMap.get(vnfr.getName()) - + " -> " - + computeNodeMap.get(hostComputeNodeMap.get(vnfr.getName()))); + + hostComputeNodeMap.get(vnfr.getName())); } catch (Exception e) { logger.warn(" Problem checking on compute node for " + r.getIp()); logger.debug("/////////////////////////////////////"); logger.debug(hostComputeNodeMap.toString()); logger.debug("/////////////////////////////////////"); - logger.debug(computeNodeMap.toString()); } } } From ad870e161ce1f4f9506180813c627bcdb7db6c78 Mon Sep 17 00:00:00 2001 From: mah88 Date: Mon, 18 Dec 2017 18:13:00 +0100 Subject: [PATCH 4/4] Update CoreModule.java --- src/main/java/org/openbaton/nse/beans/core/CoreModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java index a0cc3a1..f22b91a 100755 --- a/src/main/java/org/openbaton/nse/beans/core/CoreModule.java +++ b/src/main/java/org/openbaton/nse/beans/core/CoreModule.java @@ -537,7 +537,7 @@ private void updateOpenStackOverview() { // "Entry " // + vnfci.getHostname() // + " already added to " - // + current_compute_node); + // + current_compute_node); } else { //logger.debug( // "adding " + vnfci.getHostname() + " to " + current_compute_node);