Skip to content
This repository has been archived by the owner on Mar 8, 2020. It is now read-only.

Commit

Permalink
fix the links to playground
Browse files Browse the repository at this point in the history
includes some minor doc changes as well.

Signed-off-by: Dave Kelsey <d_kelsey@uk.ibm.com>
  • Loading branch information
Dave Kelsey committed Apr 11, 2018
1 parent 20c603a commit 15d8f8a
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,22 @@ describe('Config', () => {
};

service.links = {
docs: 'https://hyperledger.github.io/composer/next/introduction/introduction.html',
tutorial: 'https://hyperledger.github.io/composer/next/tutorials/playground-tutorial.html',
community: 'https://hyperledger.github.io/composer/next/support/support-index.html',
docs: 'https://hyperledger.github.io/composer/latest/introduction/introduction.html',
tutorial: 'https://hyperledger.github.io/composer/latest/tutorials/playground-tutorial.html',
community: 'https://hyperledger.github.io/composer/latest/support/support-index.html',
github: 'https://github.com/hyperledger/composer',
install: 'https://hyperledger.github.io/composer/next/installing/installing-index.html',
install: 'https://hyperledger.github.io/composer/latest/installing/installing-index.html',
legal: 'https://www.apache.org/licenses/LICENSE-2.0'
};

service.setValuesFromObject(object);

service.links.should.deep.equal({
docs: 'My Docs',
tutorial: 'https://hyperledger.github.io/composer/next/tutorials/playground-tutorial.html',
community: 'https://hyperledger.github.io/composer/next/support/support-index.html',
tutorial: 'https://hyperledger.github.io/composer/latest/tutorials/playground-tutorial.html',
community: 'https://hyperledger.github.io/composer/latest/support/support-index.html',
github: 'https://github.com/hyperledger/composer',
install: 'https://hyperledger.github.io/composer/next/installing/installing-index.html',
install: 'https://hyperledger.github.io/composer/latest/installing/installing-index.html',
legal: 'https://www.apache.org/licenses/LICENSE-2.0'
});
});
Expand All @@ -118,11 +118,11 @@ describe('Config', () => {
service.title.should.deep.equal('Hyperledger Composer');
service.banner.should.deep.equal(['Hyperledger', 'Composer Playground']);
service.links.should.deep.equal({
docs: 'https://hyperledger.github.io/composer/next/introduction/introduction.html',
tutorial: 'https://hyperledger.github.io/composer/next/tutorials/playground-tutorial.html',
community: 'https://hyperledger.github.io/composer/next/support/support-index.html',
docs: 'https://hyperledger.github.io/composer/latest/introduction/introduction.html',
tutorial: 'https://hyperledger.github.io/composer/latest/tutorials/playground-tutorial.html',
community: 'https://hyperledger.github.io/composer/latest/support/support-index.html',
github: 'https://github.com/hyperledger/composer',
install: 'https://hyperledger.github.io/composer/next/installing/installing-index.html',
install: 'https://hyperledger.github.io/composer/latest/installing/installing-index.html',
legal: 'https://www.apache.org/licenses/LICENSE-2.0'
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ export class Config {
this.title = 'Hyperledger Composer';
this.banner = ['Hyperledger', 'Composer Playground'];
this.links = {
docs: <string> 'https://hyperledger.github.io/composer/next/introduction/introduction.html',
tutorial: <string> 'https://hyperledger.github.io/composer/next/tutorials/playground-tutorial.html',
community: <string> 'https://hyperledger.github.io/composer/next/support/support-index.html',
docs: <string> 'https://hyperledger.github.io/composer/latest/introduction/introduction.html',
tutorial: <string> 'https://hyperledger.github.io/composer/latest/tutorials/playground-tutorial.html',
community: <string> 'https://hyperledger.github.io/composer/latest/support/support-index.html',
github: <string> 'https://github.com/hyperledger/composer',
install: <string> 'https://hyperledger.github.io/composer/next/installing/installing-index.html',
install: <string> 'https://hyperledger.github.io/composer/latest/installing/installing-index.html',
legal: <string> 'https://www.apache.org/licenses/LICENSE-2.0'
};
this.analyticsID = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ excerpt: How to deploy a business network

Before a business network definition can be deployed it must be packaged into a _Business Network Archive_ (.bna) file. The `composer archive create` command is used to create a business network archive file from a business network definition folder on disk.

Once the business network archive file has been created it can be deployed to a runtime using the [`composer network install`](../reference/composer.network.install.html) command followed by a [`composer network start`](../reference/composer.network.start.html) command.
Once the business network archive file has been created it can be deployed to {{site.data.conrefs.hlf_full}} using the [`composer network install`](../reference/composer.network.install.html) command followed by a [`composer network start`](../reference/composer.network.start.html) command.

For example:

composer network install --archiveFile tutorial-network@1.0.0.bna --card PeerAdmin@fabric-network
composer network start --networkName tutorial-network --networkVersion 1.0.0 --card PeerAdmin@Fabric-network --networkAdmin admin --networkAdminEnrollSecret adminpw
composer network start --networkName tutorial-network --networkVersion 1.0.0 --card PeerAdmin@fabric-network --networkAdmin admin --networkAdminEnrollSecret adminpw

To upgrade the business network definition for an already deployed business network use the [`composer network upgrade`](../reference/composer.network.upgrade.html) CLI command.

Expand Down Expand Up @@ -64,7 +64,7 @@ You can use additional options to the [`composer network start`](../reference/co

If the business network administrator has an enrollment ID and enrollment secret, you can use the `-A` (business network administrator) and `-S` (business network administrator uses enrollment secret) flags. For example, the following command will create a business network administrator for the existing `admin` enrollment ID:

composer network start --networkName tutorial-network --networkVersion 1.0.0 --c PeerAdmin@Fabric-network -A admin -S adminpw
composer network start --networkName tutorial-network --networkVersion 1.0.0 --c PeerAdmin@fabric-network -A admin -S adminpw

## Deploying business networks using Playground locally

Expand All @@ -74,16 +74,6 @@ When deploying a business network using playground, you will be prompted to ente

When deploying a business network using Playground locally, you must have at least one business network card with the `PeerAdmin` role and at least one business network card with the `ChannelAdmin` role. Each of these business network cards must contain the correct admin certificates.

## Errors deploying a business network to a local fabric using the {{site.data.conrefs.composer_full}} Playground

When deploying a business network to an instance of {{site.data.conrefs.hlf_full}} by using a locally installed {{site.data.conrefs.composer_full}} Playground, you may encounter the following error:

```
Error: error trying to list instantiated chaincodes. Error: chaincode error (status 500, message: Authorization for GETCHAINCODES on channel getchaincodes has been denied with error Failed verifying that proposal's creator satisfies local MSP principal during channelless check policy with policy [Admins]:[This identity is not an admin])
```

Once this error has occurred, you must delete your local browser storage to restore normal function. *Please note*: Deleting local browser storage will delete your Web Browser Connection business network cards (but not your real fabric connection business network cards that are in the card store). For more information on this error, see the [specific error page](../problems/deployment-local-playground.html)

## References

* [**Composer CLI commands**](../reference/commands.html)
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ sidebar: sidebars/accordion-toc0.md

This tutorial provides an insight into the process for configuring a blockchain network, spanning multiple organizations.

It outlines the steps you need configure an {{site.data.conrefs.hlf_full}} based multi-organisation blockchain network. The two-organisation blockchain network is based on a sample network provided by {{site.data.conrefs.hlf_full}}. Furthermore, it describes the steps to generate the necessary security artifacts and secure the network in either organization.
It outlines the steps you need configure a {{site.data.conrefs.hlf_full}} based multi-organisation blockchain network. The two-organisation blockchain network is based on a sample network provided by {{site.data.conrefs.hlf_full}}. Furthermore, it describes the steps to generate the necessary security artifacts and secure the network in either organization.

Once the blockchain network is configured, we show how to deploy a business network (eg. a Commodity trading business network from our sample networks), which runs in its own chaincode container and which is instantiated on the ledger shared across both organizations. We then show interactions with the shared ledger as different participants / identities, as generated by an Identity provider in each organization.

It is recommended that you first follow the accompanying singie organization tutorial first ; this tutorial demonstrates how to deploy a blockchain network to an instance of {{site.data.conrefs.hlf_full}} for a single organization, and will explain some of the concepts in more detail.

The {site.data.conrefs.hlf_full}} blockchain network (for two organizations) in this tutorial is configured using docker containers, with both organizations' fabric networks, on the same machine - obviously, in the real world, they'll be in separate IP networks or domains, or secure Cloud environments.
The {{site.data.conrefs.hlf_full}} blockchain network (for two organizations) in this tutorial is configured using docker containers, with both organizations' fabric networks, on the same machine - obviously, in the real world, they'll be in separate IP networks or domains, or secure Cloud environments.

The tutorial has colour-coded steps for convenience, to indicate 'which organization' should follow a particular step or sequence - or indeed, if steps are needed for both Orgs.

Expand Down

0 comments on commit 15d8f8a

Please sign in to comment.