Skip to content

AS Numbers Management #9410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 33 commits into from
Closed
Show file tree
Hide file tree
Changes from 28 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
71fa2b4
AS Number Range Management
nvazquez Jun 18, 2024
ca0db84
AS number management extensions
nvazquez Jun 26, 2024
c40d88c
UI: Minor fix for releasing AS number
nvazquez Jun 26, 2024
79e4fc6
UI: Move management of AS Range to Zone details view
Pearl1594 Jun 27, 2024
d969ea3
Fix specify_as_number column in network_offering table to set the def…
harikrishna-patnala Jul 4, 2024
0074ba4
Add events for AS number operations
Pearl1594 Jul 8, 2024
bd12ed8
Allow users to list AS Numbers and fix network form for Normal users
Pearl1594 Jul 8, 2024
3c5c824
Add AS number details to list networks response
Pearl1594 Jul 8, 2024
e934e13
Fix Allocated time format
Pearl1594 Jul 8, 2024
6c0a2fe
Fix: Do not release AS number if acquired network requires AS number
nvazquez Jul 8, 2024
1e681f2
Fix event type
Pearl1594 Jul 9, 2024
429647f
UI: Add Routing mode and Specify AS to the network offering details
nvazquez Jul 9, 2024
4f64f7b
Fix release AS number of network deletion
nvazquez Jul 9, 2024
7325dd5
API: Add networkId as listASNumber parameter
nvazquez Jul 10, 2024
120a0d1
Add Network name to the search view filter for AS numbers
Pearl1594 Jul 10, 2024
a8f9ded
Present allocated time in human readable format - Pubilc IP / AS Numbers
Pearl1594 Jul 10, 2024
8fbb73b
Add account / domain filter for AS numbers
Pearl1594 Jul 15, 2024
2c7e243
Add support for AS numbers on VPC offerings
Pearl1594 Jul 15, 2024
21a89cc
Fix release AS number on VPC deletion
nvazquez Jul 16, 2024
9723c7b
Update server/src/main/java/com/cloud/dc/BGPServiceImpl.java
weizhouapache Jul 18, 2024
c29acff
Update server/src/main/java/com/cloud/dc/BGPServiceImpl.java
weizhouapache Jul 18, 2024
18c947f
Fix missing column on asnumber table
nvazquez Jul 19, 2024
c60901e
Fix listASNumbers API to support vpcid and obtain AS number from vpc …
nvazquez Jul 18, 2024
e0c33dc
Prevent listing 0 AS number for VPC
Pearl1594 Jul 18, 2024
bfadb0d
Fix create Isolated Network form
nvazquez Jul 19, 2024
6d5f7bf
Merge branch 'main' into upstream-asnumber-mgmt
weizhouapache Jul 22, 2024
a5abbd5
Update server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
weizhouapache Jul 22, 2024
b0691de
Update server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
weizhouapache Jul 22, 2024
86e989a
Allow creation of networks by users with as numbers
Pearl1594 Jul 19, 2024
1f6d0d1
Address review comments
nvazquez Jul 25, 2024
bebab75
Move BGPService to bgp package and inject it on BaseCmd
nvazquez Jul 25, 2024
0054303
Revert changes for CKS and address more comments
nvazquez Jul 25, 2024
4b24143
Display left side menu option for AS number only for root admin
nvazquez Jul 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions api/src/main/java/com/cloud/dc/ASNumber.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.dc;

import org.apache.cloudstack.acl.InfrastructureEntity;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;

import java.util.Date;

public interface ASNumber extends InfrastructureEntity, InternalIdentity, Identity {

Long getAccountId();
Long getDomainId();
long getAsNumber();
long getAsNumberRangeId();
long getDataCenterId();
Date getAllocatedTime();
boolean isAllocated();
Long getNetworkId();
Long getVpcId();
Date getCreated();
Date getRemoved();
}
31 changes: 31 additions & 0 deletions api/src/main/java/com/cloud/dc/ASNumberRange.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.dc;

import org.apache.cloudstack.acl.InfrastructureEntity;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;

import java.util.Date;

public interface ASNumberRange extends InfrastructureEntity, InternalIdentity, Identity {

long getStartASNumber();
long getEndASNumber();
long getDataCenterId();
Date getCreated();
}
32 changes: 32 additions & 0 deletions api/src/main/java/com/cloud/dc/BGPService.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.dc;

import com.cloud.utils.Pair;
import org.apache.cloudstack.api.command.user.bgp.ListASNumbersCmd;

import java.util.List;

public interface BGPService {

ASNumberRange createASNumberRange(long zoneId, long startASNumber, long endASNumber);
List<ASNumberRange> listASNumberRanges(Long zoneId);
Pair<List<ASNumber>, Integer> listASNumbers(ListASNumbersCmd cmd);
boolean allocateASNumber(long zoneId, Long asNumber, Long networkId, Long vpcId);
Pair<Boolean, String> releaseASNumber(long zoneId, long asNumber, boolean isReleaseNetworkDestroy);
boolean deleteASRange(long id);
}
5 changes: 5 additions & 0 deletions api/src/main/java/com/cloud/event/EventTypes.java
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,11 @@ public class EventTypes {
public static final String EVENT_VLAN_IP_RANGE_RELEASE = "VLAN.IP.RANGE.RELEASE";
public static final String EVENT_VLAN_IP_RANGE_UPDATE = "VLAN.IP.RANGE.UPDATE";

// AS Number
public static final String EVENT_AS_RANGE_CREATE = "AS.RANGE.CREATE";
public static final String EVENT_AS_RANGE_DELETE = "AS.RANGE.DELETE";
public static final String EVENT_AS_NUMBER_RELEASE = "AS.NUMBER.RELEASE";

public static final String EVENT_MANAGEMENT_IP_RANGE_CREATE = "MANAGEMENT.IP.RANGE.CREATE";
public static final String EVENT_MANAGEMENT_IP_RANGE_DELETE = "MANAGEMENT.IP.RANGE.DELETE";
public static final String EVENT_MANAGEMENT_IP_RANGE_UPDATE = "MANAGEMENT.IP.RANGE.UPDATE";
Expand Down
5 changes: 5 additions & 0 deletions api/src/main/java/com/cloud/network/vpc/VpcOffering.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import java.util.Date;

import com.cloud.offering.NetworkOffering;
import org.apache.cloudstack.api.Identity;
import org.apache.cloudstack.api.InternalIdentity;

Expand Down Expand Up @@ -79,4 +80,8 @@ public enum State {
Date getRemoved();

Date getCreated();

NetworkOffering.RoutingMode getRoutingMode();

Boolean isSpecifyAsNumber();
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import java.util.List;
import java.util.Map;

import com.cloud.offering.NetworkOffering;
import org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;
import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;
import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
Expand All @@ -37,7 +38,9 @@ VpcOffering createVpcOffering(String name, String displayText, List<String> supp
Map<String, List<String>> serviceProviders,
Map serviceCapabilitystList, NetUtils.InternetProtocol internetProtocol,
Long serviceOfferingId, Boolean forNsx, String mode,
List<Long> domainIds, List<Long> zoneIds, VpcOffering.State state);
List<Long> domainIds, List<Long> zoneIds, VpcOffering.State state,
NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber);


Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(ListVPCOfferingsCmd cmd);

Expand Down
8 changes: 8 additions & 0 deletions api/src/main/java/com/cloud/offering/NetworkOffering.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ public enum NsxMode {
ROUTED
}

enum RoutingMode {
Static, Dynamic
}

public final static String SystemPublicNetwork = "System-Public-Network";
public final static String SystemControlNetwork = "System-Control-Network";
public final static String SystemManagementNetwork = "System-Management-Network";
Expand Down Expand Up @@ -165,4 +169,8 @@ public enum NsxMode {
String getServicePackage();

Date getCreated();

RoutingMode getRoutingMode();

Boolean isSpecifyAsNumber();
}
12 changes: 12 additions & 0 deletions api/src/main/java/org/apache/cloudstack/api/ApiConstants.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,15 @@ public class ApiConstants {
public static final String ADDRESS = "address";
public static final String ALGORITHM = "algorithm";
public static final String ALIAS = "alias";
public static final String ALLOCATED_DATE = "allocateddate";
public static final String ALLOCATED_ONLY = "allocatedonly";
public static final String ANNOTATION = "annotation";
public static final String API_KEY = "apikey";
public static final String ARCHIVED = "archived";
public static final String AS_NUMBER = "asnumber";
public static final String AS_NUMBER_ID = "asnumberid";
public static final String ASN_RANGE = "asnrange";
public static final String ASN_RANGE_ID = "asnrangeid";
public static final String ASYNC_BACKUP = "asyncbackup";
public static final String AUTO_SELECT = "autoselect";
public static final String USER_API_KEY = "userapikey";
Expand Down Expand Up @@ -170,6 +175,7 @@ public class ApiConstants {
public static final String DURATION = "duration";
public static final String ELIGIBLE = "eligible";
public static final String EMAIL = "email";
public static final String END_ASN = "endasn";
public static final String END_DATE = "enddate";
public static final String END_IP = "endip";
public static final String END_IPV6 = "endipv6";
Expand Down Expand Up @@ -438,6 +444,7 @@ public class ApiConstants {
public static final String SNAPSHOT_QUIESCEVM = "quiescevm";
public static final String SOURCE_ZONE_ID = "sourcezoneid";
public static final String SSL_VERIFICATION = "sslverification";
public static final String START_ASN = "startasn";
public static final String START_DATE = "startdate";
public static final String START_ID = "startid";
public static final String START_IP = "startip";
Expand Down Expand Up @@ -515,6 +522,7 @@ public class ApiConstants {
public static final String ISOLATED_PVLAN = "isolatedpvlan";
public static final String ISOLATED_PVLAN_TYPE = "isolatedpvlantype";
public static final String ISOLATION_URI = "isolationuri";
public static final String IS_ALLOCATED = "isallocated";
public static final String IS_DEDICATED = "isdedicated";
public static final String TAKEN = "taken";
public static final String VM_AVAILABLE = "vmavailable";
Expand Down Expand Up @@ -543,6 +551,7 @@ public class ApiConstants {
public static final String NETWORK_ID = "networkid";
public static final String NETWORK_FILTER = "networkfilter";
public static final String NIC_ID = "nicid";
public static final String SPECIFY_AS_NUMBER = "specifyasnumber";
public static final String SPECIFY_VLAN = "specifyvlan";
public static final String IS_DEFAULT = "isdefault";
public static final String IS_SYSTEM = "issystem";
Expand Down Expand Up @@ -683,6 +692,8 @@ public class ApiConstants {
public static final String ASSOCIATED_NETWORK = "associatednetwork";
public static final String ASSOCIATED_NETWORK_ID = "associatednetworkid";
public static final String ASSOCIATED_NETWORK_NAME = "associatednetworkname";
public static final String ASSOCIATED_VPC_ID = "associatedvpcid";
public static final String ASSOCIATED_VPC_NAME = "associatedvpcname";
public static final String SOURCE_NAT_SUPPORTED = "sourcenatsupported";
public static final String RESOURCE_STATE = "resourcestate";
public static final String PROJECT_INVITE_REQUIRED = "projectinviterequired";
Expand Down Expand Up @@ -958,6 +969,7 @@ public class ApiConstants {
public static final String NUMBER = "number";
public static final String IS_DYNAMICALLY_SCALABLE = "isdynamicallyscalable";
public static final String ROUTING = "isrouting";
public static final String ROUTING_MODE = "routingmode";
public static final String MAX_CONNECTIONS = "maxconnections";
public static final String SERVICE_STATE = "servicestate";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import java.util.Map;
import java.util.Set;

import com.cloud.dc.ASNumber;
import com.cloud.dc.ASNumberRange;
import org.apache.cloudstack.storage.object.Bucket;
import org.apache.cloudstack.affinity.AffinityGroup;
import org.apache.cloudstack.affinity.AffinityGroupResponse;
Expand All @@ -31,6 +33,8 @@
import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.ApplicationLoadBalancerResponse;
import org.apache.cloudstack.api.response.ASNRangeResponse;
import org.apache.cloudstack.api.response.ASNumberResponse;
import org.apache.cloudstack.api.response.AsyncJobResponse;
import org.apache.cloudstack.api.response.AutoScalePolicyResponse;
import org.apache.cloudstack.api.response.AutoScaleVmGroupResponse;
Expand Down Expand Up @@ -549,4 +553,8 @@ List<TemplateResponse> createTemplateResponses(ResponseView view, VirtualMachine
ObjectStoreResponse createObjectStoreResponse(ObjectStore os);

BucketResponse createBucketResponse(Bucket bucket);

ASNRangeResponse createASNumberRangeResponse(ASNumberRange asnRange);

ASNumberResponse createASNumberResponse(ASNumber asn);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package org.apache.cloudstack.api.command.admin.bgp;

import com.cloud.dc.ASNumberRange;
import com.cloud.dc.BGPService;
import com.cloud.exception.ConcurrentOperationException;
import com.cloud.exception.InsufficientCapacityException;
import com.cloud.exception.NetworkRuleConflictException;
import com.cloud.exception.ResourceAllocationException;
import com.cloud.exception.ResourceUnavailableException;
import com.cloud.user.Account;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.response.ASNRangeResponse;
import org.apache.cloudstack.api.response.ZoneResponse;

import javax.inject.Inject;

@APICommand(name = "createASNRange",
description = "Creates a range of Autonomous Systems for BGP Dynamic Routing",
responseObject = ASNRangeResponse.class,
entityType = {ASNumberRange.class},
since = "4.20.0",
authorized = {RoleType.Admin})
public class CreateASNRangeCmd extends BaseCmd {

@Parameter(name = ApiConstants.ZONE_ID, type = BaseCmd.CommandType.UUID, entityType = ZoneResponse.class,
description = "the zone ID", required = true)
private Long zoneId;

@Parameter(name = ApiConstants.START_ASN, type = CommandType.LONG, required=true, description = "the start AS Number")
private Long startASNumber;

@Parameter(name = ApiConstants.END_ASN, type = CommandType.LONG, required=true, description = "the end AS Number")
private Long endASNumber;

@Inject
private BGPService bgpService;

@Override
public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException {
try {
ASNumberRange asnRange = bgpService.createASNumberRange(zoneId, startASNumber, endASNumber);
ASNRangeResponse response = _responseGenerator.createASNumberRangeResponse(asnRange);
response.setResponseName(getCommandName());
setResponseObject(response);
} catch (Exception e) {
String msg = String.format("Cannot create AS Number Range %s-%s for zone %s: %s", startASNumber, endASNumber, zoneId, e.getMessage());
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, msg);
}
}

Check warning on line 71 in api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmd.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmd.java#L61-L71

Added lines #L61 - L71 were not covered by tests

@Override
public long getEntityOwnerId() {
return Account.ACCOUNT_ID_SYSTEM;
}

Check warning on line 76 in api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmd.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmd.java#L74-L76

Added lines #L74 - L76 were not covered by tests
}
Loading
Loading