Skip to content

Commit

Permalink
Merge pull request Azure#78 from tjprescott/AddStorageDataPlaneCommands
Browse files Browse the repository at this point in the history
Add storage data plane commands
  • Loading branch information
johanste committed Mar 24, 2016
2 parents c2189a5 + e1b8ee6 commit 0c48c28
Show file tree
Hide file tree
Showing 5 changed files with 264 additions and 50 deletions.
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,4 @@ src/build
/.vs/config/applicationhost.config

# Azure deployment credentials
*.pubxml

*.pubxml
13 changes: 13 additions & 0 deletions azure-cli.pyproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,15 @@
<Compile Include="azure\cli\extensions\transform.py" />
<Compile Include="azure\cli\extensions\__init__.py" />
<Compile Include="azure\cli\main.py" />
<Compile Include="azure\cli\tests\command_specs\test_spec_network.py" />
<Compile Include="azure\cli\tests\command_specs\test_spec_resource.py" />
<Compile Include="azure\cli\tests\command_specs\test_spec_vm.py" />
<Compile Include="azure\cli\tests\command_specs\__init__.py" />
<Compile Include="azure\cli\tests\test_argparse.py">
<SubType>Code</SubType>
</Compile>
<Compile Include="azure\cli\tests\test_autocommand.py" />
<Compile Include="azure\cli\tests\test_commands.py" />
<Compile Include="azure\cli\tests\test_connection_verify.py" />
<Compile Include="azure\cli\tests\test_output.py" />
<Compile Include="azure\cli\_debug.py" />
Expand Down Expand Up @@ -73,6 +78,8 @@
<Folder Include="azure\cli\commands" />
<Folder Include="azure\cli\extensions\" />
<Folder Include="azure\cli\tests\" />
<Folder Include="azure\cli\tests\command_specs\" />
<Folder Include="azure\cli\tests\recordings\" />
</ItemGroup>
<ItemGroup>
<Interpreter Include="..\env\">
Expand All @@ -87,6 +94,12 @@
<Architecture>X86</Architecture>
</Interpreter>
</ItemGroup>
<ItemGroup>
<Content Include="azure\cli\tests\recordings\command_specs.test_spec_network.test_network_usage_list.yaml" />
<Content Include="azure\cli\tests\recordings\command_specs.test_spec_resource.test_resource_group_list.yaml" />
<Content Include="azure\cli\tests\recordings\command_specs.test_spec_vm.test_vm_usage_list_westus.yaml" />
<Content Include="azure\cli\tests\recordings\README.rst" />
</ItemGroup>
<Import Project="$(PtvsTargetsFile)" Condition="Exists($(PtvsTargetsFile))" />
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="!Exists($(PtvsTargetsFile))" />
</Project>
6 changes: 4 additions & 2 deletions src/azure/cli/commands/_command_creation.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ def get_mgmt_service_client(client_type, config_type):

return client

def get_data_service_client(service_type, account_name, account_key):
client = service_type(account_name=account_name, account_key=account_key)
def get_data_service_client(service_type, account_name, account_key, connection_string=None):
client = service_type(account_name=account_name,
account_key=account_key,
connection_string=connection_string)
# TODO: enable Fiddler and user agent (task #115270703, #115270881)
return client
Loading

0 comments on commit 0c48c28

Please sign in to comment.