Skip to content

Structural changes for awsv2 plugin #98

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.

Sign up for GitHub

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

Merged
digvijay-ukirde merged 1 commit into from
Jan 26, 2026
Merged

Structural changes for awsv2 plugin #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ _num_of_opts="$#"
_cmd_opt_str="$@"

RC_JAVA_PLUGINS="aws azure cyclecloud google"
RC_SCRIPT_PLUGINS="ibmcloudgen2 openstack"
RC_SCRIPT_PLUGINS="awsv2 ibmcloudgen2 openstack"
ALL_RC_PLUGSIN="$RC_JAVA_PLUGINS $RC_SCRIPT_PLUGINS"
#RC_TARGET_FILE="brel_root.rc_plugin.tar.gz"
RC_TARGET_FILE="brel_root.hf_providers_java_plugin.tar.gz"
Expand Down
5 changes: 5 additions & 0 deletions hostProviders/awsv2/conf/lsf/awsprov_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"LogLevel": "INFO",
"AWS_CREDENTIAL_FILE": "/home/aws/credentials",
"AWS_REGION": "us-west-2"
}
39 changes: 39 additions & 0 deletions hostProviders/awsv2/conf/lsf/awsprov_templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"templates": [
{
"templateId": "Template-VM-1",
"maxNumber": 0,
"attributes": {
"type": ["String", "X86_64"],
"ncores": ["Numeric", "1"],
"ncpus": ["Numeric", "1"],
"mem": ["Numeric", "1024"],
"awshost": ["Boolean", "1"]
},
"imageId": "ami-27a1",
"subnetId": "subnet-b573",
"vmType": "t2.micro",
"keyName": "Lsf-Key",
"securityGroupIds": [""],
"instanceTags" : "group=project1",
"userData": "zone=us_west_2a"
},
{
"templateId": "Template-VM-2",
"maxNumber": 0,
"attributes": {
"type": ["String", "X86_64"],
"ncores": ["Numeric", "4"],
"ncpus": ["Numeric", "2"],
"mem": ["Numeric", "2048"],
"awshost": ["Boolean", "1"]
},
"imageId": "ami-27b1",
"subnetId": "subnet-b5738",
"vmType": "t2.micro",
"keyName": "Lsf-Key",
"securityGroupIds": [""],
"userData": "zone=us_west_2b"
}
]
}
0 hostProviders/awsv2/src/__init__.py → hostProviders/awsv2/scripts/__init__.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hostProviders/awsv2/src/aws_client.py → hostProviders/awsv2/scripts/aws_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ def _build_user_data(self, template: Dict, rc_account: str = 'default') -> str:
logger.debug("Building user data from template...")
user_data = ""
script_dir = os.path.dirname(os.path.abspath(__file__))
user_data_file = os.path.join(script_dir, "../scripts/user_data.sh")
user_data_file = os.path.join(script_dir, "user_data.sh")
logger.debug(f"Looking for user data file: {user_data_file}")

if os.path.exists(user_data_file):
Expand Down
0 hostProviders/awsv2/src/config_manager.py → ...Providers/awsv2/scripts/config_manager.py
View file
Open in desktop
File renamed without changes.
0 hostProviders/awsv2/src/db_manager.py → hostProviders/awsv2/scripts/db_manager.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hostProviders/awsv2/scripts/getAvailableTemplates.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ homeDir="$(cd "$scriptDir" && cd .. && pwd)"

export PYTHONPATH=$scriptDir

python3 $scriptDir/../src/get_available_templates.py $inJson $homeDir
python3 $scriptDir/get_available_templates.py $inJson $homeDir
2 changes: 1 addition & 1 deletion hostProviders/awsv2/scripts/getRequestStatus.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ homeDir="$(cd "$scriptDir" && cd .. && pwd)"

export PYTHONPATH=$scriptDir

python3 $scriptDir/../src/get_request_status.py $inJson $home
python3 $scriptDir/get_request_status.py $inJson $home
2 changes: 1 addition & 1 deletion hostProviders/awsv2/scripts/getReturnRequests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ homeDir="$(cd "$scriptDir" && cd .. && pwd)"

export PYTHONPATH=$scriptDir

python3 $scriptDir/../src/get_return_requests.py $inJson $home
python3 $scriptDir/get_return_requests.py $inJson $home
0 ...ders/awsv2/src/get_available_templates.py → .../awsv2/scripts/get_available_templates.py
View file
Open in desktop
File renamed without changes.
0 ...Providers/awsv2/src/get_request_status.py → ...iders/awsv2/scripts/get_request_status.py
View file
Open in desktop
File renamed without changes.
0 ...roviders/awsv2/src/get_return_requests.py → ...ders/awsv2/scripts/get_return_requests.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion hostProviders/awsv2/scripts/requestMachines.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ homeDir="$(cd "$scriptDir" && cd .. && pwd)"

export PYTHONPATH=$scriptDir

python3 $scriptDir/../src/request_machines.py $inJson $home
python3 $scriptDir/request_machines.py $inJson $home
2 changes: 1 addition & 1 deletion hostProviders/awsv2/scripts/requestReturnMachines.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ homeDir="$(cd "$scriptDir" && cd .. && pwd)"

export PYTHONPATH=$scriptDir

python3 $scriptDir/../src/request_return_machines.py $inJson $home
python3 $scriptDir/request_return_machines.py $inJson $home
0 hostProviders/awsv2/src/request_machines.py → ...oviders/awsv2/scripts/request_machines.py
View file
Open in desktop
File renamed without changes.
0 hostProviders/awsv2/src/request_manager.py → ...roviders/awsv2/scripts/request_manager.py
View file
Open in desktop
File renamed without changes.
0 ...ders/awsv2/src/request_return_machines.py → .../awsv2/scripts/request_return_machines.py
View file
Open in desktop
File renamed without changes.
0 ...viders/awsv2/src/sample_federated_auth.py → ...rs/awsv2/scripts/sample_federated_auth.py
View file
Open in desktop
File renamed without changes.
0 hostProviders/awsv2/src/template_manager.py → ...oviders/awsv2/scripts/template_manager.py
View file
Open in desktop
File renamed without changes.
0 hostProviders/awsv2/src/utils.py → hostProviders/awsv2/scripts/utils.py
View file
Open in desktop
File renamed without changes.