diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-08-28 07:06:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-28 07:06:09 +0000 |
| commit | 4e39ca947fcb30ab176bf3a2405a5b71965497f7 (patch) | |
| tree | ec00fe5909568c0b7d602bf30077a198c9cc251a /docs/testing/user/configguide | |
| parent | af86e67845ff7d074d389aa54cd4c3744d037348 (diff) | |
| parent | c9ef93de81e802bd01ec7381b243c724c38af34f (diff) | |
Merge "Remove Onos in Functest"
Diffstat (limited to 'docs/testing/user/configguide')
| -rw-r--r-- | docs/testing/user/configguide/configguide.rst | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/testing/user/configguide/configguide.rst b/docs/testing/user/configguide/configguide.rst index 716c8a135..d19939afe 100644 --- a/docs/testing/user/configguide/configguide.rst +++ b/docs/testing/user/configguide/configguide.rst @@ -120,7 +120,7 @@ recommended parameters for invoking docker container -e "DEPLOY_SCENARIO=os-<controller>-<nfv_feature>-<ha_mode>" where: os = OpenStack (No other VIM choices currently available) - controller is one of ( nosdn | odl_l2 | odl_l3 | onos | ocl) + controller is one of ( nosdn | odl_l2 | odl_l3 ) nfv_feature is one or more of ( ovs | kvm | sfc | bgpvpn | nofeature ) If several features are pertinent then use the underscore character '_' to separate each feature (e.g. ovs_kvm) @@ -319,7 +319,6 @@ should now be in place:: | | |-- images | | `-- results | `-- repos - | |-- onos | |-- doctor | `-- vnfs -- src @@ -426,8 +425,7 @@ follows:: │ │ |-- tempest │ │ `-- vping │ |-- sdn - │ │ |-- odl - │ │ `-- onos + │ │ `-- odl │ `-- vnf │ |-- aaa │ |-- ims |