Skip to content

Commit 6a18b08

Browse files
author
Ravi
committed
Merge pull request #83 from alanquillin/AddStatelikeMethodsToCloudServerObjects
Added smart statelike properties and methods to the cloud server objects
2 parents 006ecd5 + 47fb685 commit 6a18b08

80 files changed

Lines changed: 57860 additions & 694 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/Documentation/Documentation.shfbproj‎

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,43 @@
1717
<!-- SHFB properties -->
1818
<FrameworkVersion>.NET Framework 4.0</FrameworkVersion>
1919
<OutputPath>..\..\docs\html\</OutputPath>
20-
<HtmlHelpName>Documentation</HtmlHelpName>
20+
<HtmlHelpName>API Reference Documentation</HtmlHelpName>
2121
<Language>en-US</Language>
2222
<DocumentationSources>
23-
<DocumentationSource sourceFile="..\corelib\corelib.csproj" xmlns="" />
23+
<DocumentationSource sourceFile="..\corelib\corelib.csproj" xmlns="" subFolders="true" />
2424
</DocumentationSources>
2525
<BuildAssemblerVerbosity>OnlyWarningsAndErrors</BuildAssemblerVerbosity>
2626
<HelpFileFormat>HtmlHelp1, Website</HelpFileFormat>
27-
<IndentHtml>False</IndentHtml>
27+
<IndentHtml>True</IndentHtml>
2828
<KeepLogFile>True</KeepLogFile>
2929
<DisableCodeBlockComponent>False</DisableCodeBlockComponent>
3030
<CppCommentsFixup>False</CppCommentsFixup>
3131
<CleanIntermediates>True</CleanIntermediates>
32-
<SyntaxFilters>Standard</SyntaxFilters>
32+
<SyntaxFilters>CSharp, VisualBasic, CPlusPlus, JavaScript, AspNet</SyntaxFilters>
3333
<SdkLinkTarget>Blank</SdkLinkTarget>
34-
<RootNamespaceContainer>False</RootNamespaceContainer>
34+
<RootNamespaceContainer>True</RootNamespaceContainer>
3535
<PresentationStyle>VS2010</PresentationStyle>
36-
<Preliminary>False</Preliminary>
37-
<NamingMethod>Guid</NamingMethod>
38-
<HelpTitle>A Sandcastle Documented Class Library</HelpTitle>
36+
<Preliminary>True</Preliminary>
37+
<NamingMethod>MemberName</NamingMethod>
38+
<HelpTitle>openstack.net API Reference Documentation</HelpTitle>
3939
<ContentPlacement>AboveNamespaces</ContentPlacement>
40+
<RootNamespaceTitle>API Reference</RootNamespaceTitle>
41+
<WebsiteSdkLinkType>Msdn</WebsiteSdkLinkType>
42+
<HtmlSdkLinkType>Msdn</HtmlSdkLinkType>
43+
<IncludeFavorites>True</IncludeFavorites>
44+
<BinaryTOC>True</BinaryTOC>
45+
<VisibleItems>Attributes, ExplicitInterfaceImplementations, InheritedMembers, InheritedFrameworkMembers, Internals, Privates, Protected, SealedProtected, InheritedFrameworkPrivateMembers, InheritedFrameworkInternalMembers</VisibleItems>
46+
<FeedbackEMailAddress>openstack.net%40lists.rackspace.com</FeedbackEMailAddress>
47+
<CopyrightText>Copyright %28C%29 2013 Rackspace US, Inc.</CopyrightText>
48+
<CopyrightHref>https://github.com/rackspace/openstack.net/wiki/Copyright</CopyrightHref>
49+
<TransformComponentArguments>
50+
<Argument Key="logoFile" Value="openstack_net_logo.png" xmlns="" />
51+
<Argument Key="logoHeight" Value="" xmlns="" />
52+
<Argument Key="logoWidth" Value="" xmlns="" />
53+
<Argument Key="logoAltText" Value="" xmlns="" />
54+
<Argument Key="logoPlacement" Value="left" xmlns="" />
55+
<Argument Key="logoAlignment" Value="left" xmlns="" />
56+
</TransformComponentArguments>
4057
</PropertyGroup>
4158
<!-- There are no properties for these groups. AnyCPU needs to appear in
4259
order for Visual Studio to perform the build. The others are optional

‎src/Documentation/Documentation.shfbproj_alan0726‎

0 Bytes
Binary file not shown.

‎src/TraceAndTestImpact.testsettings‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<DeploymentItem filename="testing\integration\Providers\Rackspace\CloudFiles\DarkKnightRises.jpg" />
66
</Deployment>
77
<Execution>
8-
<Timeouts runTimeout="1800000" testTimeout="3600000" />
8+
<Timeouts testTimeout="3600000" />
99
<TestTypeSpecific>
1010
<UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
1111
<AssemblyResolution>

‎src/console/console.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
<Reference Include="Newtonsoft.Json">
3939
<HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
4040
</Reference>
41-
<Reference Include="SimpleRESTServices, Version=1.0.6.2, Culture=neutral, processorArchitecture=MSIL">
41+
<Reference Include="SimpleRESTServices, Version=1.0.6.3, Culture=neutral, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\SimpleRESTServices.1.0.6.2\lib\net40\SimpleRESTServices.dll</HintPath>
43+
<HintPath>..\packages\SimpleRESTServices.1.0.6.3\lib\net40\SimpleRESTServices.dll</HintPath>
4444
</Reference>
4545
<Reference Include="System" />
4646
<Reference Include="System.Core" />

‎src/console/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net40" />
4-
<package id="SimpleRESTServices" version="1.0.6.2" targetFramework="net40" />
4+
<package id="SimpleRESTServices" version="1.0.6.3" targetFramework="net40" />
55
</packages>

‎src/corelib/Core/Domain/Container.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class Container
1818
[DataMember]
1919
public long Bytes { get; set; }
2020

21-
//internal ICloudFilesProvider CloudFilesProvider { get; set; }
21+
//internal IObjectStorageProvider CloudFilesProvider { get; set; }
2222

2323
//public void AddHeader(string name)
2424
//{

‎src/corelib/Core/Domain/NewServer.cs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,28 @@
1+
using System.Collections.Generic;
12
using System.Runtime.Serialization;
23

34
namespace net.openstack.Core.Domain
45
{
56
[DataContract]
6-
public class NewServer
7+
public class NewServer : ServerBase
78
{
8-
[DataMember]
9-
public string Id { get; set; }
10-
119
[DataMember(Name = "OS-DCF:diskConfig")]
1210
public string DiskConfig { get; set; }
1311

1412
[DataMember(Name = "adminPass")]
1513
public string AdminPassword { get; set; }
1614

17-
[DataMember]
18-
public Link[] Links { get; set; }
15+
protected override void UpdateThis(ServerBase server)
16+
{
17+
base.UpdateThis(server);
18+
19+
var details = server as NewServer;
20+
21+
if (details == null)
22+
return;
23+
24+
DiskConfig = details.DiskConfig;
25+
AdminPassword = details.AdminPassword;
26+
}
1927
}
2028
}

‎src/corelib/Core/Domain/ProviderStateBase.cs‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.Linq;
4+
using System.Text;
5+
6+
namespace net.openstack.Core.Domain
7+
{
8+
public abstract class ProviderStateBase<T>
9+
{
10+
internal T Provider { get; set; }
11+
12+
internal string Region { get; set; }
13+
}
14+
}

0 commit comments

Comments
 (0)