refactor(nms): Make TypeScript generation script executable and fix P…

…ackageType usage Signed-off-by: Thomas Schmitt <thomas.schmitt@tngtech.com>
magma · May 18, 2022 · 5099783 · 5099783
1 parent f265514
commit 5099783
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/nms/app/views/equipment/GatewayDetailConfigEdit.js b/nms/app/views/equipment/GatewayDetailConfigEdit.js
@@ -16,6 +16,7 @@
 import type {
   apn_resources,
   challenge_key,
+  distribution_package,
   enodeb_serials,
   gateway_device,
   gateway_dns_configs,
@@ -25,7 +26,6 @@ import type {
   gateway_ran_configs,
   lte_gateway,
   magmad_gateway_configs,
-  package_type,
 } from '../../../generated/MagmaAPIBindings';
 
 import Accordion from '@material-ui/core/Accordion';
@@ -344,7 +344,7 @@ type Props = {
   onSave: lte_gateway => void,
 };
 
-type VersionType = $PropertyType<package_type, 'version'>;
+type VersionType = $PropertyType<distribution_package, 'version'>;
 
 export function ConfigEdit(props: Props) {
   const enqueueSnackbar = useEnqueueSnackbar();

diff --git a/nms/scripts/generateAPIFromSwaggerForTypeScript.sh b/nms/scripts/generateAPIFromSwaggerForTypeScript.sh
diff --git a/orc8r/cloud/go/services/orchestrator/obsidian/models/defaults.go b/orc8r/cloud/go/services/orchestrator/obsidian/models/defaults.go
@@ -96,7 +96,7 @@ func NewDefaultGatewayStatus(hardwareID string) *GatewayStatus {
 		},
 		PlatformInfo: &PlatformInfo{
 			VpnIP: "facebook.com",
-			Packages: []*Package{
+			Packages: []*DistributionPackage{
 				{
 					Name:    "magma",
 					Version: "0.0.0.0",

diff --git a/orc8r/cloud/go/services/orchestrator/obsidian/models/swagger.v1.yml b/orc8r/cloud/go/services/orchestrator/obsidian/models/swagger.v1.yml
@@ -38,7 +38,7 @@ magma-gen-meta:
       filename: machine_info_swaggergen.go
     - go-struct-name: NetworkInterface
       filename: network_interface_swaggergen.go
-    - go-struct-name: Package
+    - go-struct-name: DistributionPackage
       filename: distribution_package_swaggergen.go
     - go-struct-name: PlatformInfo
       filename: platform_info_swaggergen.go