Merge pull request #370 from IBM/PET-211

PET-211: add name field for floatingip
IBM · Dec 24, 2024 · 34c89a5 · 34c89a5
2 parents 0854698 + 38f49d9
commit 34c89a5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/web/src/apis/floatingip.go b/web/src/apis/floatingip.go
@@ -28,6 +28,7 @@ type FloatingIpAPI struct{}
 type FloatingIpInfo struct {
 	*BaseReference
 	IpAddress string `json:"ip_address"`
+	Name      string `json:"name"`
 }
 
 type TargetInterface struct {
@@ -44,6 +45,7 @@ type InstanceInfo struct {
 type FloatingIpResponse struct {
 	*BaseID
 	PublicIp        string           `json:"public_ip"`
+	Name            string           `json:"name"`
 	TargetInterface *TargetInterface `json:"target_interface,omitempty"`
 	VPC             *BaseReference   `json:"vpc,omitempty"`
 }
@@ -58,6 +60,7 @@ type FloatingIpListResponse struct {
 type FloatingIpPayload struct {
 	PublicSubnet *BaseReference `json:"public_subnet" binding:"omitempty"`
 	PublicIp     string         `json:"public_ip" binding:"omitempty,ipv4"`
+	Name         string         `json:"name" binding:"omitempty"`
 	Instance     *BaseID        `json:"instance" binding:"omitempty"`
 	Bandwidth    int64          `json:"bandwidth" binding:"omitempty"`
 }
@@ -201,7 +204,7 @@ func (v *FloatingIpAPI) Create(c *gin.Context) {
 			return
 		}
 	}
-	floatingIp, err := floatingIpAdmin.Create(ctx, instance, publicSubnet, payload.PublicIp)
+	floatingIp, err := floatingIpAdmin.Create(ctx, instance, publicSubnet, payload.PublicIp, payload.Name)
 	if err != nil {
 		ErrorResponse(c, http.StatusBadRequest, "Failed to create floating ip", err)
 		return
@@ -220,6 +223,7 @@ func (v *FloatingIpAPI) getFloatingIpResponse(ctx context.Context, floatingIp *m
 			ID: floatingIp.UUID,
 		},
 		PublicIp: floatingIp.FipAddress,
+		Name:     floatingIp.Name,
 	}
 	if floatingIp.Router != nil {
 		floatingIpResp.VPC = &BaseReference{
@@ -258,6 +262,7 @@ func (v *FloatingIpAPI) List(c *gin.Context) {
 	ctx := c.Request.Context()
 	offsetStr := c.DefaultQuery("offset", "0")
 	limitStr := c.DefaultQuery("limit", "50")
+	queryStr := c.DefaultQuery("query", "")
 	offset, err := strconv.Atoi(offsetStr)
 	if err != nil {
 		ErrorResponse(c, http.StatusBadRequest, "Invalid query offset: "+offsetStr, err)
@@ -272,7 +277,7 @@ func (v *FloatingIpAPI) List(c *gin.Context) {
 		ErrorResponse(c, http.StatusBadRequest, "Invalid query offset or limit", err)
 		return
 	}
-	total, floatingIps, err := floatingIpAdmin.List(ctx, int64(offset), int64(limit), "-created_at", "")
+	total, floatingIps, err := floatingIpAdmin.List(ctx, int64(offset), int64(limit), "-created_at", queryStr)
 	if err != nil {
 		ErrorResponse(c, http.StatusBadRequest, "Failed to list floatingIps", err)
 		return

diff --git a/web/src/model/floatingip.go b/web/src/model/floatingip.go
@@ -12,7 +12,8 @@ import (
 
 type FloatingIp struct {
 	Model
-	Owner      int64  `gorm:"default:1"` /* The organization ID of the resource */
+	Owner      int64  `gorm:"default:1"`                     /* The organization ID of the resource */
+	Name       string `gorm:"type:varchar(64)",gorm:"index"` /* The name of the resource */
 	FipAddress string `gorm:"type:varchar(64)"`
 	IntAddress string `gorm:"type:varchar(64)"`
 	InstanceID int64

diff --git a/web/src/routes/floatingip.go b/web/src/routes/floatingip.go
@@ -37,7 +37,7 @@ type FloatingIps struct {
 type FloatingIpAdmin struct{}
 type FloatingIpView struct{}
 
-func (a *FloatingIpAdmin) Create(ctx context.Context, instance *model.Instance, pubSubnet *model.Subnet, publicIp string) (floatingIp *model.FloatingIp, err error) {
+func (a *FloatingIpAdmin) Create(ctx context.Context, instance *model.Instance, pubSubnet *model.Subnet, publicIp string, name string) (floatingIp *model.FloatingIp, err error) {
 	memberShip := GetMemberShip(ctx)
 	permit := memberShip.CheckPermission(model.Writer)
 	if !permit {
@@ -59,7 +59,7 @@ func (a *FloatingIpAdmin) Create(ctx context.Context, instance *model.Instance,
 			db.Rollback()
 		}
 	}()
-	floatingIp = &model.FloatingIp{Model: model.Model{Creater: memberShip.UserID}, Owner: memberShip.OrgID}
+	floatingIp = &model.FloatingIp{Model: model.Model{Creater: memberShip.UserID}, Owner: memberShip.OrgID, Name: name}
 	err = db.Create(floatingIp).Error
 	if err != nil {
 		log.Println("DB failed to create floating ip", err)
@@ -285,7 +285,7 @@ func (a *FloatingIpAdmin) List(ctx context.Context, offset, limit int64, order,
 		order = "created_at"
 	}
 	if query != "" {
-		query = fmt.Sprintf("fip_address like '%%%s%%' or int_address like '%%%s%%'", query, query)
+		query = fmt.Sprintf("fip_address like '%%%s%%' or int_address like '%%%s%%' or name like '%%%s%%'", query, query)
 	}
 
 	db := DB()
@@ -455,14 +455,15 @@ func (v *FloatingIpView) Create(c *macaron.Context, store session.Store) {
 	redirectTo := "../floatingips"
 	instID := c.QueryInt64("instance")
 	publicIp := c.QueryTrim("publicip")
+	name := c.QueryTrim("name")
 	instance, err := instanceAdmin.Get(ctx, int64(instID))
 	if err != nil {
 		log.Println("Failed to get instance ", err)
 		c.Data["ErrorMsg"] = err.Error()
 		c.HTML(500, "500")
 		return
 	}
-	_, err = floatingIpAdmin.Create(c.Req.Context(), instance, nil, publicIp)
+	_, err = floatingIpAdmin.Create(c.Req.Context(), instance, nil, publicIp, name)
 	if err != nil {
 		log.Println("Failed to create floating ip", err)
 		c.Data["ErrorMsg"] = err.Error()

diff --git a/web/templates/floatingips.tmpl b/web/templates/floatingips.tmpl
@@ -25,6 +25,7 @@
 									{{ if $.IsAdmin }}
 			                        <th>{{.i18n.Tr "ID"}}</th>
 									{{ end }}
+									<th>{{.i18n.Tr "Name"}}</th>
 			                        <th>{{.i18n.Tr "FloatingIP"}}</th>
 			                        <th>{{.i18n.Tr "InternalIP"}}</th>
 			                        <th>{{.i18n.Tr "Instance"}}</th>
@@ -39,6 +40,7 @@
 									{{ if $.IsAdmin }}
 			                        <td>{{.ID}}</td>
 									{{ end }}
+									<td>{{.Name}}</td>
 			                        <td>{{.FipAddress}}</td>
 			                        <td>{{.IntAddress}}</td>
 			                        <td>

diff --git a/web/templates/floatingips_new.tmpl b/web/templates/floatingips_new.tmpl
@@ -14,6 +14,10 @@
 								{{.i18n.Tr "Create New Floating Ip"}}
 							</h3>
 							<div class="ui attached segment">
+								<div class="required inline field">
+									<label for="name">{{.i18n.Tr "Name"}}</label>
+									<input id="name" name="name" placeholder="{{.i18n.Tr "Name"}}">
+								</div>
 								<div class="required inline field">
 									<label for="instance">{{.i18n.Tr "Instance Address"}}</label>
 									<div class="ui selection dropdown">