From 7e718a81cad3d3cbbcf3694013f39cda3b0dacb2 Mon Sep 17 00:00:00 2001
From: Chris Rankin <chris.rankin@r3.com>
Date: Wed, 3 May 2017 10:52:39 +0100
Subject: [PATCH] Fixes for Network Visualiser (#618)

* Restore Zurich and Cairo to cities.txt
* Only display each node's common name in Network Visualiser.
---
 .../main/resources/net/corda/core/node/cities.txt |  3 +++
 .../kotlin/net/corda/simulation/Simulation.kt     |  5 ++---
 .../net/corda/netmap/VisualiserViewModel.kt       | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/core/src/main/resources/net/corda/core/node/cities.txt b/core/src/main/resources/net/corda/core/node/cities.txt
index f02ac0d026..baf4c4f814 100644
--- a/core/src/main/resources/net/corda/core/node/cities.txt
+++ b/core/src/main/resources/net/corda/core/node/cities.txt
@@ -997,3 +997,6 @@ Bristol (GB)	-2.57	51.45
 Yokosuka (JP)	139.67	35.28
 Akola (IN)	77	20.72
 Belgaum (IN)	74.5	15.87
+# These have been added back by hand
+Cairo (EG)	31.25	30.06
+Zurich (CH)	8.55	47.36
diff --git a/samples/irs-demo/src/main/kotlin/net/corda/simulation/Simulation.kt b/samples/irs-demo/src/main/kotlin/net/corda/simulation/Simulation.kt
index 97dd1efb21..19177a86fa 100644
--- a/samples/irs-demo/src/main/kotlin/net/corda/simulation/Simulation.kt
+++ b/samples/irs-demo/src/main/kotlin/net/corda/simulation/Simulation.kt
@@ -2,7 +2,6 @@ package net.corda.simulation
 
 import com.google.common.util.concurrent.Futures
 import com.google.common.util.concurrent.ListenableFuture
-import net.corda.core.crypto.X509Utilities
 import net.corda.core.flatMap
 import net.corda.core.flows.FlowLogic
 import net.corda.core.messaging.SingleMessageRecipient
@@ -123,7 +122,7 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
             val cfg = TestNodeConfiguration(
                     baseDirectory = config.baseDirectory,
                     // TODO: Make a more realistic legal name
-                    myLegalName = "CN=Rates Service Provider,O=R3,OU=corda,L=London,C=UK",
+                    myLegalName = "CN=Rates Service Provider,O=R3,OU=corda,L=Madrid,C=ES",
                     nearestCity = "Madrid",
                     networkMapService = null)
             return object : SimulatedNode(cfg, network, networkMapAddr, advertisedServices, id, overrideServices, entropyRoot) {
@@ -147,7 +146,7 @@ abstract class Simulation(val networkSendManuallyPumped: Boolean,
             val cfg = TestNodeConfiguration(
                     baseDirectory = config.baseDirectory,
                     // TODO: Make a more realistic legal name
-                    myLegalName = "Regulator A,O=R3,OU=corda,L=London,C=UK",
+                    myLegalName = "CN=Regulator A,O=R3,OU=corda,L=Paris,C=FR",
                     nearestCity = "Paris",
                     networkMapService = null)
             return object : SimulatedNode(cfg, network, networkMapAddr, advertisedServices, id, overrideServices, entropyRoot) {
diff --git a/samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserViewModel.kt b/samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserViewModel.kt
index 2df50a60ee..920a44c22a 100644
--- a/samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserViewModel.kt
+++ b/samples/network-visualiser/src/main/kotlin/net/corda/netmap/VisualiserViewModel.kt
@@ -7,9 +7,12 @@ import javafx.scene.layout.StackPane
 import javafx.scene.shape.Circle
 import javafx.scene.shape.Line
 import javafx.util.Duration
+import net.corda.core.crypto.commonName
 import net.corda.core.utilities.ProgressTracker
+import net.corda.node.services.config.NodeConfiguration
 import net.corda.simulation.IRSSimulation
 import net.corda.testing.node.MockNetwork
+import org.bouncycastle.asn1.x500.X500Name
 import java.util.*
 
 class VisualiserViewModel {
@@ -114,13 +117,13 @@ class VisualiserViewModel {
         bankCount = simulation.banks.size
         serviceCount = simulation.serviceProviders.size + simulation.regulators.size
         for ((index, bank) in simulation.banks.withIndex()) {
-            nodesToWidgets[bank] = makeNodeWidget(bank, "bank", bank.configuration.myLegalName, NetworkMapVisualiser.NodeType.BANK, index)
+            nodesToWidgets[bank] = makeNodeWidget(bank, "bank", bank.configuration.displayName, NetworkMapVisualiser.NodeType.BANK, index)
         }
         for ((index, service) in simulation.serviceProviders.withIndex()) {
-            nodesToWidgets[service] = makeNodeWidget(service, "network-service", service.configuration.myLegalName, NetworkMapVisualiser.NodeType.SERVICE, index)
+            nodesToWidgets[service] = makeNodeWidget(service, "network-service", service.configuration.displayName, NetworkMapVisualiser.NodeType.SERVICE, index)
         }
         for ((index, service) in simulation.regulators.withIndex()) {
-            nodesToWidgets[service] = makeNodeWidget(service, "regulator", service.configuration.myLegalName, NetworkMapVisualiser.NodeType.SERVICE, index + simulation.serviceProviders.size)
+            nodesToWidgets[service] = makeNodeWidget(service, "regulator", service.configuration.displayName, NetworkMapVisualiser.NodeType.SERVICE, index + simulation.serviceProviders.size)
         }
     }
 
@@ -219,3 +222,9 @@ class VisualiserViewModel {
     }
 
 }
+
+private val NodeConfiguration.displayName: String get() = try {
+    X500Name(myLegalName).commonName
+} catch(ex: IllegalArgumentException) {
+    myLegalName
+}