Skip to content

Commit

Permalink
[FAB-1141] Latest changes incorporated
Browse files Browse the repository at this point in the history
Updated to use bytes for signature_header and
channel_header on common Header.

Regenerated protos.

Updated .behaverc to only run the bootstrap.feature
at the moment.

Removed unused python artifacts.

Fixed issue with Compose whereby service names
needed to be collected on construction.

Now document generator creates cert loading for
python.

Cleaned up BDD per Gari.

Added flag to disable default chain startup in peers.
Was causing issue and using code from test package.

Added user install deployment step with verification prior
to deployment.

Updated README.md to include steps for virtualenv usage for
python.

Now set localMSPID for peers.

Now use a separate developer from peerOrg1 to join channel. First
developer gives the returned genesis block to other orgs developer.

Bumpled timeout on streams to 110 secs.

Now set OrdererAddresses config value.

Change-Id: I161fc2e3568388e193a09b9aa86512dd334e2eed
Signed-off-by: jeffgarratt <garratt.jeff@gmail.com>
  • Loading branch information
jeffgarratt committed Mar 4, 2017
1 parent 2724ba4 commit 5b48469
Show file tree
Hide file tree
Showing 96 changed files with 5,089 additions and 11,933 deletions.
15 changes: 2 additions & 13 deletions bddtests/.behaverc
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
[behave]
tags=~@issue_767
~@issueUtxo
~@issue_477
~@issue_1207
~@issue_1565
~@issue_RBAC_TCERT_With_Attributes
~@sdk
~@devops
~@preV1

~@FAB-314

name=^((?!1 Kafka Orderer and 3 Kafka Brokers).)*$
tags=~@orderer
~@endorser
98 changes: 98 additions & 0 deletions bddtests/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
# Welcome to the Behavioral Driven Development (BDD) subsytem for Fabric
Developers will find these mechanisms useful for both exploratory and verification purposes.

## Getting started

### Installation

#### Setup python virtual environment wrapper usage

```
sudo pip install virtualenv
sudo pip install virtualenvwrapper
export WORKON_HOME=~/Envs
source /usr/local/bin/virtualenvwrapper.sh
```

#### Setup your virtual environment for behave
[Virtual Environment Guide](http://docs.python-guide.org/en/latest/dev/virtualenvs/)


```
mkvirtualenv -p /usr/bin/python2.7 behave_venv
```

This will automaticall switch you to the new environment if successful. In the future, you can switch to the virtual environment using the workon command as shown below.

```
workon behave_venv
```


#### Now install required modules into the virtual environment

**NOTE**: If you have issues installing the modules below, and you are running the vagrant environment, consider performing a **vagrant destroy** followed by a **vagrant up**.

```
pip install behave
pip install grpcio-tools
pip install "pysha3==1.0b1"
pip install b3j0f.aop
pip install jinja2
# The pyopenssl install gives errors, but installs succeeds
pip install pyopenssl
pip install ecdsa
pip install python-slugify
pip install pyyaml
```

### Running behave

#### Peer Executable and Docker containers

Behave requires the peer executable for packaging deployments. To make the peer execute the following command.


```
#Change to the root fabric folder to perform the following commands.
cd ..
# Optionally perform the following clean if you are unsure of your environments state.
make clean
make peer
```

The behave system also uses several docker containers. Execute the following commands to create the required docker containers.

```
make peer-docker
make orderer-docker
```

Change back to the bddtests folder (Where this readme is located) to execute subsequent behave commands.

```
cd bddtests
```

#### Running all of the behave features and suppressing skipped steps (-k)

The following behave commands should be executed from within this folder.

```
behave -k -D cache-deployment-spec
```

#### Running a specific feature

```
behave -k -D cache-deployment-spec features/bootstrap.feature
```

### Deactivating your behave virtual environment
Once you are done using behave and you wish to switch back to your normal
python environment, issue the following command.

```
deactivate
```
229 changes: 0 additions & 229 deletions bddtests/api_pb2.py

This file was deleted.

Loading

0 comments on commit 5b48469

Please sign in to comment.