Skip to content
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

Jump to bottom

Issue with back-to-back invocations of the image-copy extension #149

Open
groupvrg opened this issue Apr 26, 2018 · 10 comments
Open

Issue with back-to-back invocations of the image-copy extension #149

groupvrg opened this issue Apr 26, 2018 · 10 comments
Assignees
@qwordy
Labels
customer-reported Issues that are reported by GitHub users external to the Azure organization. extension/image-copy feature-request This issue requires a new behavior in the product in order be resolved.
Milestone
Backlog

Comments

@groupvrg
Copy link

  • If the issue is to do with Azure CLI 2.0 in-particular, create an issue here at Azure/azure-cli

Extension name (the extension in question)

image-copy extension

Description of issue (in as much detail as possible)

Multiple copy between the same src/dst region/image is unsuccesful.

I run the same image copy command, twice back to back and after the first run, the 2nd run always fails with the same issue irrespective of
a) the src/dst pair of regions
b) the dst being cleaned up before the 2nd run, so that the 2nd run looks like a fresh copy and not a replace.

root@prash-sf-home:/home/ubuntu# az image copy --source-resource-group "cbn-default" --source-object-name "cbn-base-image-copy-test" --target-location eastasia southeastasia centralus eastus eastus2 westus uksouth --target-resource-group "cbn-default" --cleanup --source-type vm
Getting os disk id of the source vm/image
Creating source snapshot
Getting sas url for the source snapshot
Creating resource group: image-copy-rg
Target location count: 7
Starting async process for all locations
eastus2 - Creating target storage account (can be slow sometimes)
southeastasia - Creating target storage account (can be slow sometimes)
eastus - Creating target storage account (can be slow sometimes)
eastasia - Creating target storage account (can be slow sometimes)
westus - Creating target storage account (can be slow sometimes)
centralus - Creating target storage account (can be slow sometimes)
uksouth - Creating target storage account (can be slow sometimes)
eastus2 - Creating container in the target storage account
eastasia - Creating container in the target storage account
uksouth - Creating container in the target storage account
southeastasia - Creating container in the target storage account
eastus2 - Copying blob to target storage account
eastasia - Copying blob to target storage account
uksouth - Copying blob to target storage account
southeastasia - Copying blob to target storage account
eastus2 - Copy progress: 0.0%
uksouth - Copy progress: 0.0%
eastasia - Copy progress: 0.0%
southeastasia - Copy progress: 0.0%
westus - Creating container in the target storage account
eastus - Creating container in the target storage account
centralus - Creating container in the target storage account
westus - Copying blob to target storage account
centralus - Copying blob to target storage account
eastus - Copying blob to target storage account
westus - Copy progress: 0.0%
centralus - Copy progress: 0.0%
eastus - Copy progress: 0.0%
westus - Copy progress: 0.1%
centralus - Copy progress: 0.1%
uksouth - Copy progress: 0.1%
eastasia - Copy progress: 0.1%
southeastasia - Copy progress: 0.1%
eastus2 - Copy progress: 0.1%
eastus - Copy progress: 0.1%
westus - Copy progress: 1.0%
westus - Copy time: 0:04:53.812894
westus - Creating snapshot in target region from the copied blob
westus - Creating final image
centralus - Copy progress: 1.0%
centralus - Copy time: 0:06:35.704296
centralus - Creating snapshot in target region from the copied blob
centralus - Creating final image
eastus - Copy progress: 1.0%
eastus - Copy time: 0:07:56.970567
eastus - Creating snapshot in target region from the copied blob
eastus2 - Copy progress: 1.0%
eastus - Creating final image
eastus2 - Copy time: 0:08:58.687965
eastus2 - Creating snapshot in target region from the copied blob
uksouth - Copy progress: 1.0%
eastasia - Copy progress: 1.0%
uksouth - Copy time: 0:09:19.071384
uksouth - Creating snapshot in target region from the copied blob
command failed: ['/opt/az/bin/python3', '-m', 'azure.cli', 'snapshot', 'create', '--resource-group', 'image-copy-rg', '--name', 'cbn-base-image-copy-test_os_disk_snapshot-uksouth', '--location', 'uksouth', '--source', 'https://uksouthe8d016f.blob.core.windows.net/snapshots/cbn-base-image-copy-test_os_disk_snapshot.vhd', '--output', 'json', '--tags', 'created_by=image-copy-extension']
output: ERROR: The source blob https://uksouthe8d016f.blob.core.windows.net/snapshots/cbn-base-image-copy-test_os_disk_snapshot.vhd is not accessible.

eastasia - Copy time: 0:09:28.489634
eastasia - Creating snapshot in target region from the copied blob
eastus2 - Creating final image
southeastasia - Copy progress: 1.0%
southeastasia - Copy time: 0:09:55.284068
southeastasia - Creating snapshot in target region from the copied blob
eastasia - Creating final image
southeastasia - Creating final image
Deleting transient resources
@tamirkamara
Copy link
Contributor

Hi @groupvrg,

  1. What's the time difference between 2 runs of the command?
  2. Can you rerun the sequence without the "cleanup" switch and see if the error persists?

Thanks

@groupvrg
Copy link
Author

Hi tamirkamara,

  1. The failure seems to happen when i do it immediately (~10 sec diff) or when i give it some time (~15 mins diff).
  2. The issue does not happen when i run back-to-back without the cleanup option.

thanks

@tamirkamara
Copy link
Contributor

So that explains it...
When you ask for a cleanup all temp resources are deleted when the command is over. However, deleting resources on the azure infrastructure is async sometimes, meaning that although you don't see it in the portal it's still there to an extent.
My experience is that the storage account is the resource that is most likely to take a couple of minutes to be completely deleted. When you rerun the command quickly enough, it will retry to create the storage account with the same name as before and that will start causing issues.

Is this a scenario - running the command a few times with little time in between, something you do often?

@groupvrg
Copy link
Author

groupvrg commented Apr 30, 2018 via email

@tamirkamara
Copy link
Contributor

My personal experiments and tests for this extension showed that a few minutes is all it takes for the resources to be purged completely. To my knowledge it's not possible to check the progress on this process.
The initial idea of using predetermined resource names (like in storage accounts and snapshots) was to increase the tractability of what the extension is doing.
I realize that this might be problematic in certain use-cases (as you experienced) and I think that the right course of action would be to include some random string in the resource names.

@groupvrg I ask that you report back if you actually see the problem in the day-to-day operations so that I can priorities this change.

@groupvrg
Copy link
Author

groupvrg commented May 1, 2018 via email

@alex-miro
Copy link

I ran into the same issue, though it was definitely more that a just a few minutes between the command invocation. How about the temp resource groups is generated with a random name suffix ? Would it help ?

@tamirkamara
Copy link
Contributor

Did you happen to notice which step fails? You can gain more details by adding the --debug flag.

Also, version 0.0.8 was just released and it uses a random string in storage account names. I'd give it a try.

@alex-miro
Copy link

It seems to happen in the last stage :

az image copy --cleanup --source-resource-group jenkins-image-build-20180820-161304 --source-object-name OL75-18.8.20.55599-20180820-161304 --target-location centralus --target-resource-group fg-image-auto
WARNING: Getting os disk id of the source vm/image
WARNING: Creating source snapshot
WARNING: Getting sas url for the source snapshot
WARNING: Creating resource group: image-copy-rg
WARNING: Target location count: 1
WARNING: Starting async process for all locations
WARNING: centralus - Creating target storage account (can be slow sometimes)
WARNING: centralus - Creating container in the target storage account
WARNING: centralus - Copying blob to target storage account
WARNING: centralus - Copy progress: 0%
WARNING: centralus - Copy progress: 100%
WARNING: centralus - Copy time: 0:07:58.523060
WARNING: centralus - Creating snapshot in target region from the copied blob
ERROR: command failed: ['/usr/lib64/az/bin/python', '-m', 'azure.cli', 'snapshot', 'create', '--resource-group', 'image-copy-rg', '--name', 'OL75-18.8.20.55599-20180820-161304_os_disk_snapshot-centralus', '--location', 'centralus', '--source', u'https://centraluse2e2c9dfb385285.blob.core.windows.net/snapshots/OL75-18.8.20.55599-20180820-161304_os_disk_snapshot.vhd', '--output', 'json', '--tags', 'created_by=image-copy-extension']
ERROR: output: ERROR: The source blob https://centraluse2e2c9dfb385285.blob.core.windows.net/snapshots/OL75-18.8.20.55599-20180820-161304_os_disk_snapshot.vhd is not accessible.

I'll add --debug to get more info next time.

@yonzhan yonzhan assigned qwordy and anqyan and unassigned anqyan Dec 25, 2019
@yonzhan
Copy link
Collaborator

yonzhan commented Dec 25, 2019

issue triaged.

@azure-sdk azure-sdk added the customer-reported Issues that are reported by GitHub users external to the Azure organization. label Sep 24, 2020
@yonzhan yonzhan added the feature-request This issue requires a new behavior in the product in order be resolved. label Feb 21, 2022
@yonzhan yonzhan added this to the Backlog milestone Feb 21, 2022
haroonf pushed a commit to haroonf/azure-cli-extensions that referenced this issue Sep 2, 2022
@StrawnSC
Merge pull request Azure#149 from calvinsID/revert-139-no-dockerfile
4c8d4a0 
Revert "`az containerapp up`: Support No Dockerfile Scenario"
kairu-ms pushed a commit that referenced this issue May 20, 2024
@jordlay @PerfectChaos
@jddarby @patrykkulik-microsoft @Cyclam
AZ AOSM Extension Refactor (#7429)
8decf29 
* Merge Temp mavenir wheel into MAIN (#135)

* added empty template parser

* Initial scaffolding of some new classes

* added utils, added base builder + reader + their children, added nfd and vhd processors

* moved utils to common folder + added local file builder

* Add some basic implementations

* add new commands and restructure command groups

* better naming for command groups

* revert addition on the onboard command group

* update HISTORY.rst

* fix style issue

* fix linting issues

* added empty vhd and nfd processors; moved client factory from old repo

* Add template parser interface (BaseParser)

* Add parameters to BaseParser

* Make defaults_path optional in base_parser

* defaults_path defaults to None in base_parser

* add helm chart parser class and common exceptions

* add missing doc strings

* Change parser class to input template class

* added all input config params + comments; added common arm template config; added instructions for completing publish/delete

* add typing to base processor and add copyright statement to new files

* fixed formatting on input configs

* fixed nsd input config + tidied other input config files

* added comments for images; general formatting

* rename template parsers to input templates and add helm chart processor

* add __init__.py to folders

* fixed imports + added innit in folders

* fixed imports + added defaults for input params

* Not quite complete first pass at definition folder handlers

* added generate config log; fixed input config objects

* rename InputTemplate to InputArtifacts

* tidied write config + added read config; deleted json file checked in by mistake

* added overwrite validation to generate config; added j2 templates to common

* added validation to base config and nsd

* Add UTs and fix up definition folder code

* added validation to nsd + cnf; added default_file_name property; added tests for generate config; added example nsd-input.jsonc for testing

* add vhd processor

* remove leftover file from merge

* added vnf config validation; improved comment spacing on input.json; fixed depends on format; changes type for optional params

* added optional output file name param to generate config; removed misc print statements

* Fix up some type hinting

* added write manifest bicep and nf application to base handler; fixed helm config to produce correct bicep

* push latest changes

* Initial ArmInputTemplate class

* Outline ArmBuildProcessor hierarchy

* Update VNF tests to keep built output for comparison

* WIP, for sharing with Jacob

* Incremental update

* added vnf config validation; improved comment spacing on input.json; fixed depends on format; changes type for optional params

* added optional output file name param to generate config; removed misc print statements

* Approximately complete ARM processor. No tests, no testing yet.

* Fix artifact store reference

* WIP

* fixed cnf bicep template

* fixed multiple helm/vhd/arm error; working vnfartifactmanifet; attempted vnfdefintiion with testing code still in; updated write bicep functions to take 2 arguments for vnf case

* fixed cnfdef bicep; return correct type in cnf handler

* Added outputfolder name to base handler; reorganised templates folder structure; added constants for cnf j2 templates; implemented build (tested with mocks) for cnf handler; implemented localfileACR artifact to_dict function; updated write for artifact_builder.py; added overwriting folder logic to defintion folder builder

* renamed write manifest; updated nf templates to deploy initial resources; vnf templates working; vnf build commands working

* added logic to cnf handler for manifest and definition supporting files + config mappings

* fixed cnf params files; added render params for vnf

* fix HelmChartInput issues

* Merge arm-processor code into Jacob's branch (#127)

* Initial ArmInputTemplate class

* Outline ArmBuildProcessor hierarchy

* Update VNF tests to keep built output for comparison

* Initial ArmInputTemplate class

* Outline ArmBuildProcessor hierarchy

* Update VNF tests to keep built output for comparison

* WIP, for sharing with Jacob

* Incremental update

* Approximately complete ARM processor. No tests, no testing yet.

* Fix artifact store reference

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* added build deploy params schema to base handler; added functionality for deployParams to be added as supporting file for cnd

* fix majority of linting issues

* renamed write on base handler to render; added build logic for manifest and artifact list for vnf

* added write manifest bicep and nf application to base handler; fixed helm config to produce correct bicep

* fixed cnf bicep template

* Initial ArmInputTemplate class

* complete helm chart processor

* almost finished NFD processor

* WIP, for sharing with Jacob

* Incremental update

* added vnf config validation; improved comment spacing on input.json; fixed depends on format; changes type for optional params

* added optional output file name param to generate config; removed misc print statements

* Approximately complete ARM processor. No tests, no testing yet.

* WIP

* fixed multiple helm/vhd/arm error; working vnfartifactmanifet; attempted vnfdefintiion with testing code still in; updated write bicep functions to take 2 arguments for vnf case

* fixed cnfdef bicep; return correct type in cnf handler

* Added outputfolder name to base handler; reorganised templates folder structure; added constants for cnf j2 templates; implemented build (tested with mocks) for cnf handler; implemented localfileACR artifact to_dict function; updated write for artifact_builder.py; added overwriting folder logic to defintion folder builder

* renamed write manifest; updated nf templates to deploy initial resources; vnf templates working; vnf build commands working

* added logic to cnf handler for manifest and definition supporting files + config mappings

* fixed cnf params files; added render params for vnf

* added build deploy params schema to base handler; added functionality for deployParams to be added as supporting file for cnd

* renamed write on base handler to render; added build logic for manifest and artifact list for vnf

* fix up code

* fix base input

* run isort

* implemented vnf build + removed test code; fixed arm processor

* fixed templates

* removed multiple vhds from vnf + fixed bicep; made path to mappings optional for cnf

* renamed write file to render contents

* fixed helm chart processor + small tidy up

* commit for build handover; not working + handover notes sent separately

* run isort

* fix issues in input classes

* add generic schema and value mapping generation and fix arm and vhd processors

* push changes I forgot to push before xmas

* checked out fixed build processors and inputs from jdarby/add-build-processors

* fix values and schema generation

* add RET generation for ARM templates

* fix linting issues

* made input file name constant + renamed inputs to match changes

* checked out build processor changes

* Moved _render_deployment_params_schema and _build_deploy_params_schema to nfd base handler; added default_config logic to cnf handler;created deploymentParamers for cnf + vnf

* changed j2 template for vhd image name

* HELM CHART PROCESSOR CHANGES! fixed registry value path and depends on profile in cnf template

* fixed nsd artifact manifest, changed artifact type in all processers (PROCESSOR CHANGE)

* implemented nsd build get artifact manifest and get artifact list

* added base bicep to all handlers; edited j2 templates to note that base resources should be deployed first on publish; made all build use constants

* added to_dict for localfileACRartifact

* added source namespcae and source reigstry to artifact + in helm processor callinh remote arc artifacts

* finish nfd processor

* add copyright statement to helm processor file

* linting

* created common params folder (making new jsonbuilder), adding get params config to base', renamed get_config to get_input_config; aded logging to vnf; chnged custom.py publish inputs

* partially ready commit; added cmd context to base + added some logic to nsds

* added all parameters constant

* tidied vnf handler; added common params logic to cnf

* markups inc tidy up

* renamed snake_case param

* add nsd output config

* taken some input and build processor changes from jdarby/build_processor branch

* Add logging, improve doc string and fix mypy errors for inputs

* fix 2 bugs introduced by merging buildprocessors and adding json deploy params

* fixed how aosm client is passed to build; properly get nfdv object with api client

* refactored vnf handler to create processors upfront

* refactor cnf to instantiate processors upfront

* Improve docstrings, add logging and fix linting issues for build processors

* nsd temp commit

* fix missed conflict

* fix linting and formatting issue

* rename + add constants + add new definition tempalte

* simplified render bicep definiton contents + removes all constants for filenames from nf handlers and templates

* build nsd bicep core working

* fixed nsd bicep

* Fix two minor CLI bugs (#129)

* Fix bug where the build directory wasn't deleted

* Fix bug where the json wasn't output correctly

* fixed incorrect merge fix

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* small fixes; removed location from nfd input, removed comma from vnd def template, fixed artifact version in nsds, fixed vhd validation

* made cgs name constant to fix error in mappings

* added store type to all the templates

* tidy up + small markups

* removed version state from the definition biceps

* fixed bug where schemas and defaults were copied incorrectly

* made artifact paths absolute in all cases except nsd nfs, where paht is relative to nsd output folder

* added missing comments; renamed common params + edited its format; changed custom to take path

* added existing back to all templates + descriptors of resources

* Merge publish into temp wheel branch (#131)

* Move artifact create from dict logic to instantiating code

* Create CommandContext class to hold Azure clients and CLI options, and pass instance through to the delete and publish commands.

* Mostly implemented and working publish. Lots of debug code still present.

* Publish done and mostly tested.

* Add some more logging. Remove help text referring to --order-params.

* Update src/aosm/azext_aosm/common/artifact.py

Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* fix merge conflicts

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* Minor input improvements (#132)

* fixed common params files for all

* remove prints; remove sourcelocaldockerimage + add correct validation; edit input.json comments

* fixed extract tar error

* only create oras_client once - temp solution

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* edited input file (#133)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* fixed getparamsconfig for vnf/nsd; added fixes for building correct python wheel

* Achurchard/publish (#130)

Markups from publish PR

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: jordlay <72226943+jordlay@users.noreply.github.com>

* bug fixes for chart with subcharts

* added ruamel

* Use safe yaml loading

* Move code out of import list

* Fix errant config line bug

* fixed deployparams error (#134)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* fixed yaml load error

* disabled multi anchor yaml warning for values.yaml

* delete accidental deployparams file

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Chaos Chhapi <chaos.chhapi@metaswitch.com>
Co-authored-by: Jacob <53872686+jddarby@users.noreply.github.com>
Co-authored-by: Jacob Darby <jdarby@microsoft.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: patrykkulik-microsoft <116072282+patrykkulik-microsoft@users.noreply.github.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* fix silly yaml import

* moved config validate to init, commented out delete command, add context to publish + passed paths properly in custom.py

* Add Helm template validation to the build method in the CLI (#136)

* added empty template parser

* Initial scaffolding of some new classes

* added utils, added base builder + reader + their children, added nfd and vhd processors

* moved utils to common folder + added local file builder

* Add some basic implementations

* add new commands and restructure command groups

* better naming for command groups

* revert addition on the onboard command group

* update HISTORY.rst

* fix style issue

* fix linting issues

* added empty vhd and nfd processors; moved client factory from old repo

* Add template parser interface (BaseParser)

* Add parameters to BaseParser

* Make defaults_path optional in base_parser

* defaults_path defaults to None in base_parser

* add helm chart parser class and common exceptions

* add missing doc strings

* Change parser class to input template class

* added all input config params + comments; added common arm template config; added instructions for completing publish/delete

* add typing to base processor and add copyright statement to new files

* fixed formatting on input configs

* fixed nsd input config + tidied other input config files

* added comments for images; general formatting

* rename template parsers to input templates and add helm chart processor

* add __init__.py to folders

* fixed imports + added innit in folders

* fixed imports + added defaults for input params

* Not quite complete first pass at definition folder handlers

* added generate config log; fixed input config objects

* rename InputTemplate to InputArtifacts

* tidied write config + added read config; deleted json file checked in by mistake

* added overwrite validation to generate config; added j2 templates to common

* added validation to base config and nsd

* Add UTs and fix up definition folder code

* added validation to nsd + cnf; added default_file_name property; added tests for generate config; added example nsd-input.jsonc for testing

* add vhd processor

* remove leftover file from merge

* added vnf config validation; improved comment spacing on input.json; fixed depends on format; changes type for optional params

* added optional output file name param to generate config; removed misc print statements

* Fix up some type hinting

* added write manifest bicep and nf application to base handler; fixed helm config to produce correct bicep

* push latest changes

* Initial ArmInputTemplate class

* Outline ArmBuildProcessor hierarchy

* Update VNF tests to keep built output for comparison

* WIP, for sharing with Jacob

* Incremental update

* added vnf config validation; improved comment spacing on input.json; fixed depends on format; changes type for optional params

* added optional output file name param to generate config; removed misc print statements

* Approximately complete ARM processor. No tests, no testing yet.

* Fix artifact store reference

* WIP

* fixed cnf bicep template

* fixed multiple helm/vhd/arm error; working vnfartifactmanifet; attempted vnfdefintiion with testing code still in; updated write bicep functions to take 2 arguments for vnf case

* fixed cnfdef bicep; return correct type in cnf handler

* Added outputfolder name to base handler; reorganised templates folder structure; added constants for cnf j2 templates; implemented build (tested with mocks) for cnf handler; implemented localfileACR artifact to_dict function; updated write for artifact_builder.py; added overwriting folder logic to defintion folder builder

* renamed write manifest; updated nf templates to deploy initial resources; vnf templates working; vnf build commands working

* added logic to cnf handler for manifest and definition supporting files + config mappings

* fixed cnf params files; added render params for vnf

* fix HelmChartInput issues

* Merge arm-processor code into Jacob's branch (#127)

* Initial ArmInputTemplate class

* Outline ArmBuildProcessor hierarchy

* Update VNF tests to keep built output for comparison

* Initial ArmInputTemplate class

* Outline ArmBuildProcessor hierarchy

* Update VNF tests to keep built output for comparison

* WIP, for sharing with Jacob

* Incremental update

* Approximately complete ARM processor. No tests, no testing yet.

* Fix artifact store reference

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* added build deploy params schema to base handler; added functionality for deployParams to be added as supporting file for cnd

* fix majority of linting issues

* renamed write on base handler to render; added build logic for manifest and artifact list for vnf

* added write manifest bicep and nf application to base handler; fixed helm config to produce correct bicep

* fixed cnf bicep template

* Initial ArmInputTemplate class

* complete helm chart processor

* almost finished NFD processor

* WIP, for sharing with Jacob

* Incremental update

* added vnf config validation; improved comment spacing on input.json; fixed depends on format; changes type for optional params

* added optional output file name param to generate config; removed misc print statements

* Approximately complete ARM processor. No tests, no testing yet.

* WIP

* fixed multiple helm/vhd/arm error; working vnfartifactmanifet; attempted vnfdefintiion with testing code still in; updated write bicep functions to take 2 arguments for vnf case

* fixed cnfdef bicep; return correct type in cnf handler

* Added outputfolder name to base handler; reorganised templates folder structure; added constants for cnf j2 templates; implemented build (tested with mocks) for cnf handler; implemented localfileACR artifact to_dict function; updated write for artifact_builder.py; added overwriting folder logic to defintion folder builder

* renamed write manifest; updated nf templates to deploy initial resources; vnf templates working; vnf build commands working

* added logic to cnf handler for manifest and definition supporting files + config mappings

* fixed cnf params files; added render params for vnf

* added build deploy params schema to base handler; added functionality for deployParams to be added as supporting file for cnd

* renamed write on base handler to render; added build logic for manifest and artifact list for vnf

* fix up code

* fix base input

* run isort

* implemented vnf build + removed test code; fixed arm processor

* fixed templates

* removed multiple vhds from vnf + fixed bicep; made path to mappings optional for cnf

* renamed write file to render contents

* fixed helm chart processor + small tidy up

* commit for build handover; not working + handover notes sent separately

* run isort

* fix issues in input classes

* add generic schema and value mapping generation and fix arm and vhd processors

* push changes I forgot to push before xmas

* checked out fixed build processors and inputs from jdarby/add-build-processors

* fix values and schema generation

* add RET generation for ARM templates

* fix linting issues

* made input file name constant + renamed inputs to match changes

* checked out build processor changes

* Moved _render_deployment_params_schema and _build_deploy_params_schema to nfd base handler; added default_config logic to cnf handler;created deploymentParamers for cnf + vnf

* changed j2 template for vhd image name

* HELM CHART PROCESSOR CHANGES! fixed registry value path and depends on profile in cnf template

* fixed nsd artifact manifest, changed artifact type in all processers (PROCESSOR CHANGE)

* implemented nsd build get artifact manifest and get artifact list

* added base bicep to all handlers; edited j2 templates to note that base resources should be deployed first on publish; made all build use constants

* added to_dict for localfileACRartifact

* added source namespcae and source reigstry to artifact + in helm processor callinh remote arc artifacts

* finish nfd processor

* add copyright statement to helm processor file

* linting

* created common params folder (making new jsonbuilder), adding get params config to base', renamed get_config to get_input_config; aded logging to vnf; chnged custom.py publish inputs

* partially ready commit; added cmd context to base + added some logic to nsds

* added all parameters constant

* tidied vnf handler; added common params logic to cnf

* markups inc tidy up

* renamed snake_case param

* add nsd output config

* taken some input and build processor changes from jdarby/build_processor branch

* Add logging, improve doc string and fix mypy errors for inputs

* fix 2 bugs introduced by merging buildprocessors and adding json deploy params

* fixed how aosm client is passed to build; properly get nfdv object with api client

* refactored vnf handler to create processors upfront

* refactor cnf to instantiate processors upfront

* Improve docstrings, add logging and fix linting issues for build processors

* nsd temp commit

* fix missed conflict

* fix linting and formatting issue

* rename + add constants + add new definition tempalte

* simplified render bicep definiton contents + removes all constants for filenames from nf handlers and templates

* build nsd bicep core working

* fixed nsd bicep

* Fix two minor CLI bugs (#129)

* Fix bug where the build directory wasn't deleted

* Fix bug where the json wasn't output correctly

* fixed incorrect merge fix

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* small fixes; removed location from nfd input, removed comma from vnd def template, fixed artifact version in nsds, fixed vhd validation

* made cgs name constant to fix error in mappings

* added store type to all the templates

* tidy up + small markups

* removed version state from the definition biceps

* fixed bug where schemas and defaults were copied incorrectly

* made artifact paths absolute in all cases except nsd nfs, where paht is relative to nsd output folder

* added missing comments; renamed common params + edited its format; changed custom to take path

* added existing back to all templates + descriptors of resources

* First stab at doing helm template - check the changes here

* Merge publish into temp wheel branch (#131)

* Move artifact create from dict logic to instantiating code

* Create CommandContext class to hold Azure clients and CLI options, and pass instance through to the delete and publish commands.

* Mostly implemented and working publish. Lots of debug code still present.

* Publish done and mostly tested.

* Add some more logging. Remove help text referring to --order-params.

* Update src/aosm/azext_aosm/common/artifact.py

Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* fix merge conflicts

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* Minor input improvements (#132)

* fixed common params files for all

* remove prints; remove sourcelocaldockerimage + add correct validation; edit input.json comments

* fixed extract tar error

* only create oras_client once - temp solution

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* edited input file (#133)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Add skip step

* fixed getparamsconfig for vnf/nsd; added fixes for building correct python wheel

* Achurchard/publish (#130)

Markups from publish PR

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: jordlay <72226943+jordlay@users.noreply.github.com>

* bug fixes for chart with subcharts

* added ruamel

* Use safe yaml loading

* Move code out of import list

* Fix errant config line bug

* fixed deployparams error (#134)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* fixed yaml load error

* Change "path_to_mappings" to "default_values"

* Add unit tests

* remove the merge mistake

* Delete a file

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Chaos Chhapi <chaos.chhapi@metaswitch.com>
Co-authored-by: Jacob <53872686+jddarby@users.noreply.github.com>
Co-authored-by: Jacob Darby <jdarby@microsoft.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: jordlay <72226943+jordlay@users.noreply.github.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* Pk5/add image parsing (#137)

* Add image parsing

* Add unit tests

* Fix small log issue

* Minor markup edits

* Improve unit tests

* remove the test_utils file

* update HISTORY.rst

* update HISTORY file

* Validate that helm chart values exist (#138)

* add validation of the default values for helm charts

* Add unit tests

* update HISTORY.rst

* Markups

* Jl/nsd publish paths (#139)

* fix for relative path issue for nsd publish; fix for deployment parameters schema being wrong

* Add image parsing

* LocalFileACRArtifact converts bicep to ARM before upload.

* Remove TODO comment that is done. Refactor convert to bicep code.

* Add unit tests

* Fix small log issue

* Minor markup edits

* Add location to configObject passed to NF template. Value is hardcoded to that provided in the input.jsonc file.

* Add note on using NF name instead of NSD name when creating NFDInput

* Minor fixes: - check attribute exists before accessing it\n - better logging\n - reduce nesting

* input file (jsonc) comment updates.

* Fix NSD generate --output-file handling bug

* Minor markups.

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Patryk Kulik <patrykkulik@microsoft.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* Bump version to 1.0.0b5

* Linting and typing (#141)

Linting and type hinting fixes.

* Temp 16feb wheel (#145)

* added nexus arm processor; added nfvi type to vnfinput.json; added condition for calling each arm processor

* pipe through nfvi type from vnf input to template; added nexus input; fixed mistakes in armprocessor

* initial commit for children vnf handlers

* added core and nexus config logic

* fixed nexus input and nexus processor; fixed templates

* generalised render manifest and render definition bicep functions to use one

* added incorrect config error handling

* added nexus flag to publish; added error handling for incorrect vnf type (if forgot to put nexus flag case); tidied nexus inputs

* added vnf nexus base bicep; fixed vnf definition template; temp fix for image versions

* moved render bicep to common/utils; replaced build base bicep with render bicep

* general tidyup: removed prints, added return types

* added nfvi type to nsds

* removed old todos

* refactored nexus handler, moved generate params code into processor

* moved logic to base vnf handler; moved more logic to processor

* fix template name in vnf j2

* fixed nexus image file

* added nfvitype to nsd nf template by making new j2 + changing how nfd processor works

* added nfvitype to nsd nf template by making new j2 + changing how nfd processor works

* minor formatting

* made vnfnexus a definition type; slight refactor of custom.py

* removed nexus param, removed prints, added commented out test file

* fixed flake8 + pylint issues

* Base handler treats command inputs separately (#143)

* refactored base handler init to treat inputs from different commands separately; added better validation

* fixed error handling in base handler

* fixed error typing

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* mypy fixes

* fixed customLocation id for vnf nexus

* markups from review inc moving build manifest to parent vnf handler

* added better docstrings

* updated history.rst

* Achurchard/fix helm chart upload (#144)

* Use helm push for Helm charts (not oras push)

* Logging

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* bumped version

* Bug: No type in schema (#148)

* first fix for anyOf logic error msg

* Update src/aosm/azext_aosm/build_processors/base_processor.py

Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* Update src/aosm/azext_aosm/build_processors/base_processor.py

Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* Bug: Nexus Image Version Must be Semver (#149)

* added semver checking to input config validation; moved split image path to utils

* changed semver regex; renamed function

* fixed typo

* markups

* fix typo

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Create RG if it doesn't exist (#150)

* add validation resource group exists function

* tidied up code

* Update src/aosm/azext_aosm/definition_folder/reader/definition_folder.py

Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* renaming from markups

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* Bug Fix: NFD and NSD Manifest Names Clash (#147)

* added sa_manifest and acr_manifest property, added sa and acr to manifest names; added nsd to nsd manifest name

* create manifest name from nf/nsd name instead of acr/sa; fixed docs strings

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Fix Nexus Linting + Add Unit Tests (#146)

* fixed pylint + flake8 errors

* fix mypy errors

* fixed artifact builder tests

* temp commit for unit testing

* temp push of broken tests

* added new mocks (not perfect) for vnfs£

* fixed artifact write failure

* More mypy fixes

* fixed style issues

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* Use ephemeral tempdir for generated helm package .tgz file. (#151)

* Use ephemeral tempdir for generated helm package .tgz file.

* Fix file_path bug if .tgz file was provided by user.

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>

* add to changelog; bump version

* added check for filepath before making absolute (#154)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Template Parameters Bug (#156)

* converted vhd parameters to camel case to match what aosm expects

* markups + fixed apiVersion

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* fixed config comment (#153)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* removed image name parameter, added imageName to default config for arm and vhd input (#157)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* bumped version and updated changelog (#158)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Improve Unit Testing (#152)

* moved working tests to new folder structure; added empty tests for processors and build

* added empty generate cofnig tests; fixed and moved bicep,artifact and definitino folder builder tests

* added nexus arm tests; removed outdated vnf mocks

* added azure core tests for every function (including base)

* fixed up core and nexus arm processor

* fixed up arm processors; added logging to tests

* added arm template tests

* added test from copilot learning day

* changed assert

* removed build folder; added json dump to artifact and definition tests; improved arm processor testing

* removed mock open and replaced with new templates

* fixed linting

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Fix bool in schema bug (#160)

* check object is a dict before looking for `type` key.

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Use common.utils function to check if docker/helm is installed (code deduplication). (#161)

* changed configuration type from secret to open; updated changelog (#162)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Support using multiple images sources in our CLI (#142)

* Initial stab at making the multiple registry support work

* Update TODO

* update TODO

* merge fixes

* add logic to find registry credentials

* Code cleanup and adding unit tests

* updates to the registry class

* In Progress work

* Working publish

* Move _push_image_from_local_registry and copy_image into the registry class

* tidy up changes

* Namespace and style fixes

* Minor input config change

* unit tests

* Do not push image namespace to target ACR

* Make sure not to break the nexus part of the code

* Update CHANGELOG

* Fix error not being caught correctly

* Minor comment change

* Markups

* Update warning

* Change how we treat namespace and find images

* markups

* modify how we create the registry list

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* Fix integration tests (#163)

* Initial stab at making the multiple registry support work

* Update TODO

* update TODO

* merge fixes

* add logic to find registry credentials

* Code cleanup and adding unit tests

* updates to the registry class

* In Progress work

* Working publish

* Move _push_image_from_local_registry and copy_image into the registry class

* tidy up changes

* Namespace and style fixes

* Minor input config change

* unit tests

* Do not push image namespace to target ACR

* Make sure not to break the nexus part of the code

* Update CHANGELOG

* initial commit for integration tests

* Fix error not being caught correctly

* Minor comment change

* Fix integration tests

* Moving files around

* Working vnf integration test

* Comment out test that is not working

* Clean up the structure of the integration tests

* Delete unnecessary tests

* Fix CNF test and move a util function

* fix other integration tests

* Delete the broken tests folder

* Fix the vnf test

* move files around

* Improve the update_input_file function

* improve the nsd test

* Move files around and improve the nsd output

* remove unnecessary line

* Update recording processors and recordings

* Fix linting issues

* bad merge change

* Update the nsd output with Open CGVs

* Fix few unit tests broken by merge

* Markups

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Add docker dependency option to oras in setup.py (#164)

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* Revert "Add docker dependency option to oras in setup.py (#164)" (#165)

This reverts commit 9b6fcde.

* update history + bump version (#166)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* hot fix: anyOf bug

* hotfix: fixed 2 style errors

* bumped version to 2 (#170)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Fix linting + tests for release (#171)

* removed delete helptext and reran tests live

* fixed linting

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* added license headers to fix release jobs (#172)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Add Webhook (#159)

* initial attempt at adding roleOverride

* add comma

* removed comma as breaks single nf application

* remove prints

* fixed linting + updated history

* fixed bug in nfd processor for vnfs; updated nsd tests

* fixed lives tests

* markups

* markups2

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Expose All PRs (#173)

* Refactoring related to user customisable param exposure (#167)

* Fix: Change 'deploymentParameters' to 'deployParameters'

* Refactoring including:
 - Remove minor inconsistencies between related methods
 - Use named parameters in method calls to improve readability
 - Rename variables and methods to be more descriptive/accurate
 - Improve some exception messages
 - Make log messages clearer
 - Improve code comments
 - Improve type handling

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>

* Allow all parameters to be exposed to operator (#169)

* Fix: Change 'deploymentParameters' to 'deployParameters'

* Refactoring including:
 - Remove minor inconsistencies between related methods
 - Use named parameters in method calls to improve readability
 - Rename variables and methods to be more descriptive/accurate
 - Improve some exception messages
 - Make log messages clearer
 - Improve code comments
 - Improve type handling

* Comment out _find_image_pull_secrets_values_paths().

* Add expose_all function for NFDs.

Includes extensive renaming of variables and methods, new code comments
and docstrings.

* Add expose_all_params to nfd-input.jsonc and plumb through.

* Fix linting + tests for release (#171)

* removed delete helptext and reran tests live

* fixed linting

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* added license headers to fix release jobs (#172)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Markups

* Add Webhook (#159)

* initial attempt at adding roleOverride

* add comma

* removed comma as breaks single nf application

* remove prints

* fixed linting + updated history

* fixed bug in nfd processor for vnfs; updated nsd tests

* fixed lives tests

* markups

* markups2

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* fixed line too long

* markups including removing multiple instances

* fixed all unit tests based on new param (expose_all), removed param (multiple_instances), refactoring of deploymentParameters to deployParams, and removal of using values.schema.json

* ran live tests + removed dependsOn

* added getting defaults from arm template + added special logic for when defaults are rg().location

* fixed tests + fixed styling

* ran live tests

---------

Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: jordlay <72226943+jordlay@users.noreply.github.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Patryk Kulik <patrykkulik@microsoft.com>

---------

Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Patryk Kulik <patrykkulik@microsoft.com>

* updated history

* Fix minor config bugs (#174)

* renamed nfdvName to nfdv

* changed comment for name in NF RET for nsd input

* added ArmTemplate  optional comment to NSD input config

* changed nfdv examples in mock cgvs

* added 1:1 mapping between nfdvs and nfvisFromSite

* removed nfvi_type from nsd input config

* markups

* fixed tests + styling; markups

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Help text additions (#175)

* Add long summary, parameters and examples to help text.

* Remove parameters from help file. Instead, use the help defined in _params.py. Minor updates to text of latter.

* Fix lines too long (#176)

* updated changelog (#180)

* updated changelog

* markups

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Autogen CLI: (#181)

- Add examples
- Minor rewording
- Ensure all commands are preview

* Add quotes to the CNF input config image sources comment (#182)

* Bump jinja2 to 3.1.4. (#190)

* Remove azure-storage-blob from dependencies. (#192)

* Pk5/fix integration tests for release (#195)

* Add retry logic to fix integration tests

* Modify the publisher name because previous name is used up

* Regenerate the recordings

* Re-record test (#196)

* ran vnf test live (#197)

Co-authored-by: Jordan <jordan.layton@metaswitch.com>

* Make the vnf test live only (#198)

---------

Co-authored-by: Jordan <jordan.layton@metaswitch.com>
Co-authored-by: Chaos Chhapi <chaos.chhapi@metaswitch.com>
Co-authored-by: Jacob <53872686+jddarby@users.noreply.github.com>
Co-authored-by: Jacob Darby <jdarby@microsoft.com>
Co-authored-by: Andy Churchard <andy.churchard@metaswitch.com>
Co-authored-by: patrykkulik-microsoft <116072282+patrykkulik-microsoft@users.noreply.github.com>
Co-authored-by: Cyclam <95434717+Cyclam@users.noreply.github.com>
Co-authored-by: Patryk Kulik <patrykkulik@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@qwordy qwordy

Labels
customer-reported Issues that are reported by GitHub users external to the Azure organization. extension/image-copy feature-request This issue requires a new behavior in the product in order be resolved.
Projects
None yet
Milestone
Backlog
Development

No branches or pull requests
8 participants
@qwordy @alex-miro @derekbekoe @tamirkamara @groupvrg @azure-sdk @yonzhan @anqyan