Skip to content

Commit

Permalink
Merge pull request #93 from DMTF/Mockup-Update
Browse files Browse the repository at this point in the history
Updated bundled mockup to match 2022.3 release of public-rackmount1
  • Loading branch information
mraineri committed Feb 24, 2023
2 parents 37d248e + b022e34 commit 2236b7e
Show file tree
Hide file tree
Showing 257 changed files with 5,450 additions and 648 deletions.
159 changes: 120 additions & 39 deletions public-rackmount1/$metadata/index.xml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
],
"Oem": {},
"@odata.id": "/redfish/v1/AccountService/Accounts/1/Certificates",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
10 changes: 7 additions & 3 deletions public-rackmount1/AccountService/Accounts/1/index.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
{
"@odata.type": "#ManagerAccount.v1_5_0.ManagerAccount",
"@odata.type": "#ManagerAccount.v1_10_0.ManagerAccount",
"Id": "1",
"Name": "User Account",
"Description": "User Account",
"Enabled": true,
"Password": null,
"PasswordChangeRequired": false,
"AccountTypes": [
"Redfish"
],
"UserName": "Administrator",
"RoleId": "Administrator",
"Locked": false,
Expand All @@ -17,5 +21,5 @@
}
},
"@odata.id": "/redfish/v1/AccountService/Accounts/1",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
4 changes: 2 additions & 2 deletions public-rackmount1/AccountService/Accounts/2/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@odata.type": "#ManagerAccount.v1_5_0.ManagerAccount",
"@odata.type": "#ManagerAccount.v1_10_0.ManagerAccount",
"Id": "2",
"Name": "Employee #457",
"Description": "This user is both a Redfish administrator and a SNMPv3 user.",
Expand All @@ -24,5 +24,5 @@
}
},
"@odata.id": "/redfish/v1/AccountService/Accounts/2",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
4 changes: 2 additions & 2 deletions public-rackmount1/AccountService/Accounts/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
}
],
"@odata.id": "/redfish/v1/AccountService/Accounts",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@odata.type": "#ExternalAccountProvider.v1_1_2.ExternalAccountProvider",
"@odata.type": "#ExternalAccountProvider.v1_5_0.ExternalAccountProvider",
"Id": "ExternalRedfishService",
"Name": "Remote Redfish Service",
"Description": "Remote Redfish Service providing additional Accounts to this Redfish Service",
Expand All @@ -26,5 +26,5 @@
}
],
"@odata.id": "/redfish/v1/AccountService/ExternalAccountProviders/ExternalRedfishService",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
}
],
"@odata.id": "/redfish/v1/AccountService/ExternalAccountProviders",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@odata.type": "#Role.v1_2_4.Role",
"@odata.type": "#Role.v1_3_1.Role",
"Id": "Administrator",
"Name": "User Role",
"Description": "Admin User Role",
Expand All @@ -16,5 +16,5 @@
"OemPowerControl"
],
"@odata.id": "/redfish/v1/AccountService/Roles/Administrator",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
6 changes: 3 additions & 3 deletions public-rackmount1/AccountService/Roles/Operator/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@odata.type": "#Role.v1_2_4.Role",
"@odata.type": "#Role.v1_3_1.Role",
"Id": "Operator",
"Name": "User Role",
"Description": "Operator User Role",
Expand All @@ -11,5 +11,5 @@
],
"OemPrivileges": [],
"@odata.id": "/redfish/v1/AccountService/Roles/Operator",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
6 changes: 3 additions & 3 deletions public-rackmount1/AccountService/Roles/ReadOnly/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@odata.type": "#Role.v1_2_4.Role",
"@odata.type": "#Role.v1_3_1.Role",
"Id": "ReadOnly",
"Name": "User Role",
"Description": "ReadOnly User Role",
Expand All @@ -10,5 +10,5 @@
],
"OemPrivileges": [],
"@odata.id": "/redfish/v1/AccountService/Roles/ReadOnly",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
4 changes: 2 additions & 2 deletions public-rackmount1/AccountService/Roles/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
}
],
"@odata.id": "/redfish/v1/AccountService/Roles",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
22 changes: 19 additions & 3 deletions public-rackmount1/AccountService/index.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"@odata.type": "#AccountService.v1_7_0.AccountService",
"@odata.type": "#AccountService.v1_12_0.AccountService",
"Id": "AccountService",
"Name": "Account Service",
"Description": "Account Service",
Expand Down Expand Up @@ -92,9 +92,25 @@
}
]
},
"OAuth2": {
"AccountProviderType": "OAuth2",
"ServiceEnabled": true,
"ServiceAddresses": [
"https://contoso.org/.well-known/oauth-authorization-server"
],
"OAuth2Service": {
"Mode": "Discovery",
"Issuer": "https://contoso.org/services/oauth2",
"Audience": [
"23:11:8A:33:CF:EA",
"92384634-2938-2342-8820-489239905423"
],
"OAuthServiceSigningKeys": "ewogICAgImtleXMiOiBbCiAgICAgICAgewogICAgICAgICAgICAiZSI6ICJBUUFCIiwKICAgICAgICAgICAgImtpZCI6ICJvV1F2Tl8tRUxnd25HMzFNTEl4Rm5hTVlfNTd0Wk9FSUVQYnpaYlBqS2FBIiwKICAgICAgICAgICAgImt0eSI6ICJSU0EiLAogICAgICAgICAgICAibiI6ICJvYS1Kb2pkSGw2VHQ3N2Vma2h6aW5MMU9XNmZjMGhjQjloOTN2WUZyRVlPakozRjhfTFh1c1ItMW95MUFKdExZcF9KeVI4Q1ZET28yVGNCaTBuSkhKczF1dkN4WWljX202WE5vMHptVm1VQ2hVMnBYSlBGelZKRGV5VVhIWWVONG5yQ1k4XzlTLXlzWnlKa2RRaWJmeHlBRndUMHdpNlZldF9MYTE4N3JNZUFCU0tXdEdIVmpkOWk1UmhELWNGU1JaNk05M0s2bXFPUUpaX0pMXzJKUU93aGk5dFl4Q2drVVpqc1gyWXowMEZpdUVTWDhHcXRGQlI1UzhIT2p0b2FhZUJrTk5hYWZFOFdSUVl6QlVmOHpiNkVobUFMemc0Z0YxTVhRb3dZV25GcGpzYXcwNVRONHk3SWZJUVhLODlqbGxnbWFkWVVjbndaUmRMc1o2VTdBS1EiCiAgICAgICAgfQogICAgXQp9"
}
},
"AdditionalExternalAccountProviders": {
"@odata.id": "/redfish/v1/AccountService/ExternalAccountProviders"
},
"@odata.id": "/redfish/v1/AccountService",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,16 @@
"Certificates": [
{
"@odata.id": "/redfish/v1/Managers/BMC/NetworkProtocol/HTTPS/Certificates/1"
},
{
"@odata.id": "/redfish/v1/UpdateService/ClientCertificates/1"
},
{
"@odata.id": "/redfish/v1/Systems/437XR1138R2/VirtualMedia/CD1/Certificates/1"
}
]
},
"Oem": {},
"@odata.id": "/redfish/v1/CertificateService/CertificateLocations",
"@Redfish.Copyright": "Copyright 2014-2019 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}
200 changes: 100 additions & 100 deletions public-rackmount1/CertificateService/GenerateCSRActionInfo/index.json
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
{
"@odata.type": "#ActionInfo.v1_1_2.ActionInfo",
"Id": "GenerateCSRActionInfo",
"Name": "Generate CSR Action Info",
"Parameters": [
{
"Name": "CommonName",
"Required": true,
"DataType": "String"
},
{
"Name": "AlternativeNames",
"Required": false,
"DataType": "StringArray"
},
{
"Name": "Organization",
"Required": true,
"DataType": "String"
},
{
"Name": "OrganizationalUnit",
"Required": true,
"DataType": "String"
},
{
"Name": "City",
"Required": true,
"DataType": "String"
},
{
"Name": "State",
"Required": true,
"DataType": "String"
},
{
"Name": "Country",
"Required": true,
"DataType": "String"
},
{
"Name": "Email",
"Required": false,
"DataType": "String"
},
{
"Name": "KeyPairAlgorithm",
"Required": true,
"DataType": "String",
"AllowableValues": [
"TPM_ALG_RSA",
"TPM_ALG_ECDSA"
]
},
{
"Name": "KeyBitLength",
"Required": false,
"DataType": "Number"
},
{
"Name": "KeyCurveId",
"Required": false,
"DataType": "String",
"AllowableValues": [
"TPM_ECC_NIST_P256",
"TPM_ECC_NIST_P384",
"TPM_ECC_NIST_P521"
]
},
{
"Name": "CertificateCollection",
"Required": true,
"DataType": "Object"
},
{
"Name": "KeyUsage",
"Required": false,
"DataType": "StringArray",
"AllowableValues": [
"DigitalSignature",
"NonRepudiation",
"KeyEncipherment",
"DataEncipherment",
"KeyAgreement",
"KeyCertSign",
"CRLSigning",
"EncipherOnly",
"DecipherOnly",
"ServerAuthentication",
"ClientAuthentication",
"CodeSigning",
"EmailProtection",
"OCSPSigning"
]
}
],
"Oem": {},
"@odata.id": "/redfish/v1/CertificateService/GenerateCSRActionInfo",
"@Redfish.Copyright": "Copyright 2018-2019 DMTF. All rights reserved."
}
{
"@odata.type": "#ActionInfo.v1_3_0.ActionInfo",
"Id": "GenerateCSRActionInfo",
"Name": "Generate CSR Action Info",
"Parameters": [
{
"Name": "CommonName",
"Required": true,
"DataType": "String"
},
{
"Name": "AlternativeNames",
"Required": false,
"DataType": "StringArray"
},
{
"Name": "Organization",
"Required": true,
"DataType": "String"
},
{
"Name": "OrganizationalUnit",
"Required": true,
"DataType": "String"
},
{
"Name": "City",
"Required": true,
"DataType": "String"
},
{
"Name": "State",
"Required": true,
"DataType": "String"
},
{
"Name": "Country",
"Required": true,
"DataType": "String"
},
{
"Name": "Email",
"Required": false,
"DataType": "String"
},
{
"Name": "KeyPairAlgorithm",
"Required": true,
"DataType": "String",
"AllowableValues": [
"TPM_ALG_RSA",
"TPM_ALG_ECDSA"
]
},
{
"Name": "KeyBitLength",
"Required": false,
"DataType": "Number"
},
{
"Name": "KeyCurveId",
"Required": false,
"DataType": "String",
"AllowableValues": [
"TPM_ECC_NIST_P256",
"TPM_ECC_NIST_P384",
"TPM_ECC_NIST_P521"
]
},
{
"Name": "CertificateCollection",
"Required": true,
"DataType": "Object"
},
{
"Name": "KeyUsage",
"Required": false,
"DataType": "StringArray",
"AllowableValues": [
"DigitalSignature",
"NonRepudiation",
"KeyEncipherment",
"DataEncipherment",
"KeyAgreement",
"KeyCertSign",
"CRLSigning",
"EncipherOnly",
"DecipherOnly",
"ServerAuthentication",
"ClientAuthentication",
"CodeSigning",
"EmailProtection",
"OCSPSigning"
]
}
],
"Oem": {},
"@odata.id": "/redfish/v1/CertificateService/GenerateCSRActionInfo",
"@Redfish.Copyright": "Copyright 2014-2022 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright."
}

0 comments on commit 2236b7e

Please sign in to comment.