-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
Closed
AS Numbers Management #9410
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 ca0db84
AS number management extensions
nvazquez c40d88c
UI: Minor fix for releasing AS number
nvazquez 79e4fc6
UI: Move management of AS Range to Zone details view
Pearl1594 d969ea3
Fix specify_as_number column in network_offering table to set the def…
harikrishna-patnala 0074ba4
Add events for AS number operations
Pearl1594 bd12ed8
Allow users to list AS Numbers and fix network form for Normal users
Pearl1594 3c5c824
Add AS number details to list networks response
Pearl1594 e934e13
Fix Allocated time format
Pearl1594 6c0a2fe
Fix: Do not release AS number if acquired network requires AS number
nvazquez 1e681f2
Fix event type
Pearl1594 429647f
UI: Add Routing mode and Specify AS to the network offering details
nvazquez 4f64f7b
Fix release AS number of network deletion
nvazquez 7325dd5
API: Add networkId as listASNumber parameter
nvazquez 120a0d1
Add Network name to the search view filter for AS numbers
Pearl1594 a8f9ded
Present allocated time in human readable format - Pubilc IP / AS Numbers
Pearl1594 8fbb73b
Add account / domain filter for AS numbers
Pearl1594 2c7e243
Add support for AS numbers on VPC offerings
Pearl1594 21a89cc
Fix release AS number on VPC deletion
nvazquez 9723c7b
Update server/src/main/java/com/cloud/dc/BGPServiceImpl.java
weizhouapache c29acff
Update server/src/main/java/com/cloud/dc/BGPServiceImpl.java
weizhouapache 18c947f
Fix missing column on asnumber table
nvazquez c60901e
Fix listASNumbers API to support vpcid and obtain AS number from vpc …
nvazquez e0c33dc
Prevent listing 0 AS number for VPC
Pearl1594 bfadb0d
Fix create Isolated Network form
nvazquez 6d5f7bf
Merge branch 'main' into upstream-asnumber-mgmt
weizhouapache a5abbd5
Update server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
weizhouapache b0691de
Update server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java
weizhouapache 86e989a
Allow creation of networks by users with as numbers
Pearl1594 1f6d0d1
Address review comments
nvazquez bebab75
Move BGPService to bgp package and inject it on BaseCmd
nvazquez 0054303
Revert changes for CKS and address more comments
nvazquez 4b24143
Display left side menu option for AS number only for root admin
nvazquez File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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(); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 77 additions & 0 deletions
77
api/src/main/java/org/apache/cloudstack/api/command/admin/bgp/CreateASNRangeCmd.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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; | ||
nvazquez marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| @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); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public long getEntityOwnerId() { | ||
| return Account.ACCOUNT_ID_SYSTEM; | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.