Included VLAN/VNI in available-resources network response (#72)

* first * [auto generated] Checking in generated offline HTML doc --------- Co-authored-by: chaitra-mylarappachar <[email protected]>
HewlettPackard · Mar 1, 2023 · 611e4b8 · 611e4b8
1 parent d1e3943
commit 611e4b8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/v1/Makefile b/v1/Makefile
@@ -1,4 +1,4 @@
-# (C) Copyright 2020-2022 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2020-2023 Hewlett Packard Enterprise Development LP
 
 PWD := $(shell pwd)
 GOPATH := $(shell go env GOPATH)
@@ -13,7 +13,7 @@ export MOCK_CLIENT_PACKAGE=mockquakeclient
 # The location of any generated golang mocks
 export GO_MOCK_DIR := ${PWD}/pkg/${MOCK_CLIENT_PACKAGE}
 
-default: build
+default: gen
 
 vendor: ../go.mod ../go.sum
 	go mod download

diff --git a/v1/api/swagger/components/schemas/AvailableNetwork.yaml b/v1/api/swagger/components/schemas/AvailableNetwork.yaml
@@ -20,3 +20,9 @@ properties:
     $ref: ./NetworkPurpose.yaml
   IPPoolID:
     type: string
+  VLAN:
+    type: integer
+    description: VLAN ID of the network
+  VNI:
+    type: integer
+    description: VNI ID of the network
diff --git a/v1/html/index.html b/v1/html/index.html
diff --git a/v1/pkg/client/api/openapi.yaml b/v1/pkg/client/api/openapi.yaml
@@ -2695,19 +2695,23 @@ components:
     AvailableResources:
       example:
         Networks:
-        - IPPoolID: IPPoolID
+        - VNI: 6
+          IPPoolID: IPPoolID
           Description: Private network for intra-cluster communication
           LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
           HostUse: Default
           Purpose: Storage
           ID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
+          VLAN: 0
           Name: Private
-        - IPPoolID: IPPoolID
+        - VNI: 6
+          IPPoolID: IPPoolID
           Description: Private network for intra-cluster communication
           LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
           HostUse: Default
           Purpose: Storage
           ID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
+          VLAN: 0
           Name: Private
         Volumes:
         - TargetIQN: TargetIQN
@@ -2801,10 +2805,10 @@ components:
           ID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
         StorageInventory:
         - FlavorID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
-          Capacity: 1
+          Capacity: 5
           LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
         - FlavorID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
-          Capacity: 1
+          Capacity: 5
           LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
         SSHKeys:
         - ID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
@@ -3661,12 +3665,14 @@ components:
     AvailableNetwork:
       description: Entry of a network available within a data center location
       example:
+        VNI: 6
         IPPoolID: IPPoolID
         Description: Private network for intra-cluster communication
         LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
         HostUse: Default
         Purpose: Storage
         ID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
+        VLAN: 0
         Name: Private
       properties:
         ID:
@@ -3693,6 +3699,12 @@ components:
           $ref: '#/components/schemas/NetworkPurpose'
         IPPoolID:
           type: string
+        VLAN:
+          description: VLAN ID of the network
+          type: integer
+        VNI:
+          description: VNI ID of the network
+          type: integer
       type: object
     MachineSize:
       description: Description of a specific machine size offering
@@ -3826,7 +3838,7 @@ components:
         of a specific flavor
       example:
         FlavorID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
-        Capacity: 1
+        Capacity: 5
         LocationID: 046b6c7f-0b8a-43b9-b35d-6489e6daee91
       properties:
         FlavorID:

diff --git a/v1/pkg/client/docs/AvailableNetwork.md b/v1/pkg/client/docs/AvailableNetwork.md
@@ -11,6 +11,8 @@ Name | Type | Description | Notes
 **HostUse** | [**NetworkHostUse**](NetworkHostUse.md) |  | [optional] 
 **Purpose** | [**NetworkPurpose**](NetworkPurpose.md) |  | [optional] 
 **IPPoolID** | **string** |  | [optional] 
+**VLAN** | **int32** | VLAN ID of the network | [optional] 
+**VNI** | **int32** | VNI ID of the network | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 

diff --git a/v1/pkg/client/model_available_network.go b/v1/pkg/client/model_available_network.go
@@ -22,4 +22,8 @@ type AvailableNetwork struct {
 	HostUse NetworkHostUse `json:"HostUse,omitempty"`
 	Purpose NetworkPurpose `json:"Purpose,omitempty"`
 	IPPoolID string `json:"IPPoolID,omitempty"`
+	// VLAN ID of the network
+	VLAN int32 `json:"VLAN,omitempty"`
+	// VNI ID of the network
+	VNI int32 `json:"VNI,omitempty"`
 }