From bee96f30d246e79e957436b3310fb9730f62bc04 Mon Sep 17 00:00:00 2001
From: Mark Mydland <markmyd@microsoft.com>
Date: Tue, 15 Sep 2020 09:14:23 -0700
Subject: [PATCH] add more data for generate

---
 interface-gen/ContentGenerator.cs |  17 ++-
 interface-gen/ModelIdGenerator.cs |   8 +-
 interface-gen/modelMetadata.json  | 204 +++++++++++++++++++++++++++++-
 3 files changed, 217 insertions(+), 12 deletions(-)

diff --git a/interface-gen/ContentGenerator.cs b/interface-gen/ContentGenerator.cs
index 6d4b14a..cad4dfb 100644
--- a/interface-gen/ContentGenerator.cs
+++ b/interface-gen/ContentGenerator.cs
@@ -11,11 +11,16 @@ namespace DtdlInterfaceGenerator
     public class ContentGenerator
     {
         const int MAX_COMPONENTS = 5;
+        const int MAX_TELEMETRIES = 10;
+        const int MAX_PROPERTIES = 10;
         Dictionary<string, Content> nodes = new Dictionary<string, Content>();
 
         private static readonly string[] nodeNames = {
-            "temperature", "acceleration", "brightness", "pressure",
-            "tiltAngle", "flowRate", "intensity", "brightness" };
+            "temperature", "acceleration", "brightness", "pressure", "tiltAngle", 
+            "flowRate", "intensity", "brightness", "differentialPressure",
+            "displacement","frequency", "inductance","conductance","angularAcceleration",
+            "moisture","speed","mass","tilt","force","viscosity", "wavelength",
+            "accuracy","weight","powerRange","radiationLevel","voltage" };
 
         private static readonly string[] dtdlTypes = {
             "boolean","date", "dateTime", "double", "duration","float",
@@ -47,7 +52,7 @@ private void GenerateTelemetryNodes()
         {
             int numNodes = random.Next(0, countNodeNames);
 
-            for (int i = 0; i < numNodes; i++)
+            for (int i = 0; i < MAX_TELEMETRIES; i++)
             {
                 GenerateRandomNode("Telemetry");
             }
@@ -57,7 +62,7 @@ private void GeneratePropertyNodes()
         {
             int numNodes = random.Next(0, countNodeNames);
 
-            for (int i = 0; i < numNodes; i++)
+            for (int i = 0; i < MAX_PROPERTIES; i++)
             {
                 GenerateRandomNode("Property");
             }
@@ -143,8 +148,8 @@ private Content GenerateRandomNode(string type)
                 dif++;
             }
 
-            tc.name = versionName;
-            tc.type = type;
+            tc.name = versionName.Trim();
+            tc.type = type.Trim();
             tc.schema = RandomType();
             return tc;
         }
diff --git a/interface-gen/ModelIdGenerator.cs b/interface-gen/ModelIdGenerator.cs
index 6d22f20..2b4200a 100644
--- a/interface-gen/ModelIdGenerator.cs
+++ b/interface-gen/ModelIdGenerator.cs
@@ -52,7 +52,7 @@ private async Task GetModelId()
         {
             string product = RandomProduct();
             string model = $"dtmi:{RandomDomain()}:{RandomCompany()}:{product}";
-            AbsoluteModelId = await GetUniqueAbsoluteId(model);
+            AbsoluteModelId = await GetUniqueAbsoluteId(model.ToLower());
             ProductName = product.First().ToString().ToUpper() + product.Substring(1);
             return;
         }
@@ -74,17 +74,17 @@ private async Task<string> GetUniqueAbsoluteId(string modelBaseId)
 
         private static string RandomDomain()
         {
-            return modelMetadata.topLevelDomains[random.Next(0, countDomains)];
+            return modelMetadata.topLevelDomains[random.Next(0, countDomains)].Trim();
         }
 
         private static string RandomCompany()
         {
-            return modelMetadata.companyNames[random.Next(0, countCompanies)];
+            return modelMetadata.companyNames[random.Next(0, countCompanies)].Trim();
         }
 
         private static string RandomProduct()
         {
-            return modelMetadata.productNames[random.Next(0, countProducts)];
+            return modelMetadata.productNames[random.Next(0, countProducts)].Trim();
         }
     }
 }
\ No newline at end of file
diff --git a/interface-gen/modelMetadata.json b/interface-gen/modelMetadata.json
index 11df5da..e434962 100644
--- a/interface-gen/modelMetadata.json
+++ b/interface-gen/modelMetadata.json
@@ -26,7 +26,107 @@
         "oceanavigations",
         "crystalforce",
         "crystalcoms",
-        "greenlife"
+        "greenlife",
+        "ReichelKohlerandFriesen",
+        "DickinsonSchadenandEffertz",
+        "ParkerMarvinandSauer",
+        "KirlinParisian",
+        "KeelingPLC",
+        "WillmsLebsack",
+        "GutmannCrooks",
+        "RatkeGroup",
+        "NolanMuller",
+        "OReillyBeier",
+        "HermistonNikolaus",
+        "HauckHudsonandBoyle",
+        "TrompWalterandTurcotte",
+        "StreichGerhold",
+        "GleasonLLC",
+        "ParisianGroup",
+        "ZemlakLtd",
+        "HesselHuels",
+        "KozeyArmstrongandGibson",
+        "RueckerWildermanandGleichner",
+        "BeckerStrosin",
+        "MrazCrooks",
+        "SwiftOConnellandLemke",
+        "JerdeWindler",
+        "OKonPLC",
+        "LynchLtd",
+        "HyattDurganandSenger",
+        "MohrNikolaus",
+        "WittingKuhicandWatsica",
+        "ConsidineAbbottandGorczany",
+        "GerholdRunolfsdottirandReilly",
+        "MooreRomaguera",
+        "TremblayRolfson",
+        "SatterfieldCronin",
+        "CummerataMohr",
+        "YostMueller",
+        "TowneRaynor",
+        "GloverGroup",
+        "WaelchiandSons",
+        "KerlukeFerry",
+        "DickinsonCummerata",
+        "SteuberBahringer",
+        "ArmstrongErnser",
+        "HammesOrtizandLehner",
+        "SpencerLtd",
+        "BoscoLtd",
+        "PadbergLLC",
+        "MooreNienow",
+        "KuhicOKonandMorar",
+        "NienowGroup",
+        "WisozkRatkeandGulgowski",
+        "CummingsRunolfsson",
+        "OndrickaLindgrenandKlocko",
+        "CarrollGroup",
+        "StehrGroup",
+        "HickleOKonandWill",
+        "GottliebKutchandAufderhar",
+        "HickleJacobi",
+        "GreenholtLtd",
+        "BlickLtd",
+        "ErnserLLC",
+        "StokesSchinner",
+        "RobertsDonnellyandTorphy",
+        "BartolettiLockman",
+        "RolfsonKautzerandSchulist",
+        "RodriguezRusselandFay",
+        "GusikowskiDonnellyandGorczany",
+        "AdamsStokesandGoldner",
+        "LehnerMiller",
+        "GusikowskiOHara",
+        "HalvorsonAbernathy",
+        "BernhardInc",
+        "PacochaReynoldsandKunze",
+        "HettingerArmstrongandBaumbach",
+        "RusselStrosin",
+        "KrajcikBogisichandZieme",
+        "SchultzGroup",
+        "HermanLeuschke",
+        "KerlukeandSons",
+        "RohanKassulkeandCorkery",
+        "BednarConn",
+        "BrownGroup",
+        "ConroyLednerandWard",
+        "HettingerLLC",
+        "WardOConnellandWintheiser",
+        "GibsonGrantandKoelpin",
+        "RitchieKirlinandBailey",
+        "HaneNienowandJohnston",
+        "CollinsTreutel",
+        "DachPLC",
+        "GreenholtInc",
+        "BrakusPouros",
+        "HarveyBergstrom",
+        "AufderharFerry",
+        "HoppeKoelpin",
+        "JenkinsGroup",
+        "HermanLeuschke",
+        "KozeyPLC",
+        "HalvorsonGoldnerandSatterfield",
+        "MurazikKossandCummings"
     ],
     "productNames": [
         "aicompuunit",
@@ -52,6 +152,106 @@
         "sensorynetwork",
         "telescopesystemmodule",
         "zenithsensingcomputerlaptop",
-        "zenithsensordiagnostician"
+        "zenithsensordiagnostician",
+        "AmpCompassBolt",
+        "AnalyticalDiagnostic",
+        "AnalyticalSensorManipulator",
+        "BoltDirector",
+        "BoltMaster",
+        "CommandDominationCommander",
+        "CommandModule",
+        "ControlBoltModule",
+        "ControllingZenithShockDetector",
+        "DetectingDiagnosticMasteryManipulator",
+        "DetectingVoltManipulator",
+        "ElectricDominationZapper",
+        "ElectricRuler",
+        "ElectricityCommander",
+        "ElectricityScannerRuler",
+        "MonitoringRuler",
+        "RuleDirectingLightningModule",
+        "RulingMonitoringDetector",
+        "ScannerProbe",
+        "SensoryAnalyzerTelescope",
+        "SensoryDominatingZapper",
+        "ZapDetector",
+        "ZapMechanism",
+        "ZapperMaster",
+        "ZappingDominationCompass",
+        "AnalyzingDrawMaster",
+        "AttractingRuleTelescope",
+        "AttractingSensoryMagnetDetector",
+        "ControllingControlDetector",
+        "ControllingMagnetScanner",
+        "DiagnosticianUnit",
+        "DrawTelescopeModule",
+        "GaussDominatorMagnetizer",
+        "MagneticLocator",
+        "MagnoCompassUnit",
+        "ManipulationSensor",
+        "ManipulatorAttractor",
+        "MasteryMagnetizer",
+        "MonitoringMagnetRuler",
+        "RuleGaussMagnetizer",
+        "ScanningScannerMechanism",
+        "ScanningScannerAnalyzer",
+        "SensorCommanderMonitor",
+        "SensoryDetectingModule",
+        "SensoryKit",
+        "SensoryMagnetProbe",
+        "SensoryMagnoSensorMagnetizer",
+        "TelescopeMagnet",
+        "ZenithDiagnosticianRuler",
+        "ZenithMagnetismAttractor",
+        "ApparatusMiner",
+        "CavernDigger",
+        "CavernDirtWrench",
+        "ContactFossilizer",
+        "DirtGravelContactUtensil",
+        "EarthCommunicationSignaller",
+        "EarthGravelBroadcaster",
+        "EarthToolReciever",
+        "FunctionGeologyModule",
+        "GroundDrill",
+        "MinerPack",
+        "MineralUtensilRadio",
+        "MountainScrewdriverGraveler",
+        "OmniSoilCommunicator",
+        "RockSignaller",
+        "ServiceContactMiner",
+        "SignallingDiggerScrewdriver",
+        "SoilContactUtensil",
+        "SoilUtility",
+        "TeleDrill",
+        "TeleTransmissionsPack",
+        "TerraMinerModule",
+        "ToolUnitUtensil",
+        "UnitLink",
+        "UtensilMessagerDrill",
+        "AuxiliaryUtilityUnit",
+        "EarthDrill",
+        "EarthMiner",
+        "GeoMessager",
+        "GeologyServiceReciever",
+        "GroundUnit",
+        "LinkDiggerTool",
+        "MessagingFunctionalFossilizer",
+        "MountainCavernKit",
+        "OmniBroadcasterSignaller",
+        "OmniEarthUtility",
+        "OmniSignallingUnit",
+        "RadioDrill",
+        "RadioCommunicator",
+        "RadioMessager",
+        "RadioWrench",
+        "SignalSignaller",
+        "SoilToolReciever",
+        "StoneUtensil",
+        "TeleEarthGroundMechanism",
+        "ToolEarthWrench",
+        "ToolSignalUnit",
+        "UtensilApparatus",
+        "UtensilReciever",
+        "UtilitySignalPack"
     ]
 }
\ No newline at end of file